Another refactoring(deleted not-for-git files)