Cleanups refs #42