- first round of cleanups