remove all deprecated products in one round

This prevents us from having to loop over the deprecated products only
removing one from the branch each time.