Removed some classes that are no longer useed