Remove unused classes and methods