Cleanups refs #4