Removed unused classes and methods