Cleaning. Removed unused classes