cleanup before merge protou