refs #929 cleanup