Merge "Remove references to nonexisting classes"