Merge "Clean up class preloading"