.gitignore and cleanup