Refactoring: Remove unused code