Modify gitignore and clean up