Removed unused classes and modules