Deleted unused classes and methods