Removing unused methods
Refactoring