Fix gitignore and clean up