Merge "Remove obsolete files on preloaded classes."