Cleanups refs #10