Removed remaining dependencies on gevent.  Some stuff is probably broken