Cleanup and .gitignore update