Removed unused space and some classes