small refactoring
removed dead files