More cleanup of the request farm