File clean-up and .gitignore