Merge "Cleanup utility classes"