Removed unused classes, modules and cleaned up modules