More random cleanups

good night