Modify .gitignore and cleanup