more move rethinkgo out of handlers