UPS-1021 cleanup