cleanup and .gitignore