just a bit of cleanup before merge