WIP #204: Cleanups