more cleanup - no real code