Yet another set of cleanups