refs #893 cleanup