more cleanup - refs #737