another round of cleanups