Just another round of cleanups..