cleanup upstream tasks with regard to new next branch handling