Cleanup, refs #6542