Update gitignore and more cleanup