EPG-34484 - Remove ProductService 12