General cleanups

:x: