minor refactoring
refactoring
removed old files