cleaning before merge