Remove a few classes that were not needed.