Shouldn't need grequests because we're in a greenlet already
Misc cleanup