Merge "Remove non-existent classes from preloaded-classes"