Refactoring: removing unused files