clean up a bit of cruft and missing things from local setup
6 files changed