cleaned up and removed unused classes