Let's go back to non-requests, and clean up code while we're at it.