Moar cleanups