little more cleanup before merge