Removed duplicate files after refactoring