Cleaning up unwanted files. Minor Refactorings