Refactoring - Remove unused files