minor cleanup before merge