get rid of the openvswtich branches when relevant