diff --git a/kong/nova.py b/kong/nova.py
index 41b4b4e..bb40d59 100644
--- a/kong/nova.py
+++ b/kong/nova.py
@@ -1,6 +1,4 @@
 import json
-import logging
-import subprocess
 
 import kong.common.http
 from kong import exceptions
@@ -24,7 +22,7 @@
         self.user = user
         self.api_key = api_key
         self.project_id = project_id
-        # Default to same as base_url, but will be change on auth
+        # Default to same as base_url, but will be changed for auth
         self.management_url = self.base_url
 
     def authenticate(self, user, api_key, project_id):
@@ -104,7 +102,7 @@
         project_id = kwargs.get('project_id', self.project_id)
 
         headers['X-Auth-Token'] = self.authenticate(self.user, self.api_key,
-                                                    self.project_id)
+                                                    project_id)
         kwargs['headers'] = headers
         return super(API, self).request(method, url, **kwargs)
 
