Moar cleanups.