modify .gitignore and cleanup