#69 Cleanups