bits of cleanup and gitignored more