Removed unused classes and updated references