Removing deprecated files and minor improvment in .gitignore