last cleanup before merge