cleanup, refs #7660