Remove unused methods and classes