Removes again SUO and fixes merge in ProductMain