Cleanups refs #17