Refactoring - remove unused code