Removed some classes that were not needed