UPS-989 cleanup fixes