Cleanup and .gitignore