Cleanups #19