small refactorings. removed some unused files.