more cleanup - rjrjr