uproxy code cleanup