UPS-1414 remove old code