#75 Cleanups