Cleanups refs #27