clean up a bunch of random stuff
draft
2021-01-23, Gary Kramlich