refs #49: cleanup