diff --git a/aiogremlin/driver/cluster.py b/aiogremlin/driver/cluster.py
index 9895cda1003021f82b06c8a2b0d279b075fbf246..98c4a3b000875c4fe41b219f359c91d7799e65ae 100644
--- a/aiogremlin/driver/cluster.py
+++ b/aiogremlin/driver/cluster.py
@@ -220,5 +220,5 @@ class Cluster:
         while self._hosts:
             host = self._hosts.popleft()
             waiters.append(host.close())
-        await asyncio.gather(*waiters, loop=self._loop)
+        await asyncio.gather(*waiters)
         self._closed = True
diff --git a/aiogremlin/driver/connection.py b/aiogremlin/driver/connection.py
index cc018a6fdfa911af5f21b4c83be923d61dd14a4b..ebb21b729cf18cfa3c4e222d9edfa5528748cb32 100644
--- a/aiogremlin/driver/connection.py
+++ b/aiogremlin/driver/connection.py
@@ -46,8 +46,7 @@ class Connection:
         self._closed = False
         self._result_sets = {}
         self._receive_task = self._loop.create_task(self._receive())
-        self._semaphore = asyncio.Semaphore(value=max_inflight,
-                                            loop=self._loop)
+        self._semaphore = asyncio.Semaphore(value=max_inflight)
         if isinstance(message_serializer, type):
             message_serializer = message_serializer()
         self._message_serializer = message_serializer
diff --git a/aiogremlin/driver/pool.py b/aiogremlin/driver/pool.py
index a4070ada5a7f921c1125465bd9684556bf2a228e..c87715c7d48f867f8265780924ee5e7c62af5a74 100644
--- a/aiogremlin/driver/pool.py
+++ b/aiogremlin/driver/pool.py
@@ -189,7 +189,7 @@ class ConnectionPool:
         while self._acquired:
             conn = self._acquired.popleft()
             waiters.append(conn.close())
-        await asyncio.gather(*waiters, loop=self._loop)
+        await asyncio.gather(*waiters)
 
     async def _get_connection(self, username, password, max_inflight,
                               response_timeout, message_serializer, provider):
diff --git a/aiogremlin/driver/resultset.py b/aiogremlin/driver/resultset.py
index c0a3d64ac993840a7f45832a63feec40a541b149..a3673338df3c99905ec45af811a0f83d446dd08e 100644
--- a/aiogremlin/driver/resultset.py
+++ b/aiogremlin/driver/resultset.py
@@ -22,11 +22,11 @@ def error_handler(fn):
 class ResultSet:
     """Gremlin Server response implementated as an async iterator."""
     def __init__(self, request_id, timeout, loop):
-        self._response_queue = asyncio.Queue(loop=loop)
+        self._response_queue = asyncio.Queue()
         self._request_id = request_id
         self._loop = loop
         self._timeout = timeout
-        self._done = asyncio.Event(loop=self._loop)
+        self._done = asyncio.Event()
         self._aggregate_to = None
 
     @property
@@ -82,8 +82,7 @@ class ResultSet:
         else:
             try:
                 msg = await asyncio.wait_for(self._response_queue.get(),
-                                             timeout=self._timeout,
-                                             loop=self._loop)
+                                             timeout=self._timeout)
             except asyncio.TimeoutError:
                 self.close()
                 raise exception.ResponseTimeoutError('Response timed out')