Remaining cleanup before adding gitignore