Remove unused code
Refactoring