Move: rate limit utp to proper location