diff --git a/.mailmap b/.mailmap
new file mode 100644
index 0000000..c3f1f56
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,2 @@
+<josh.kearney@pistoncloud.com> <josh@jk0.org>
+<matt.joyce@cloudscaling.com> <matt@nycresistor.com>
diff --git a/openstackclient/common/clientmanager.py b/openstackclient/common/clientmanager.py
index 73c2e57..4d04921 100644
--- a/openstackclient/common/clientmanager.py
+++ b/openstackclient/common/clientmanager.py
@@ -20,7 +20,6 @@
 
 import logging
 
-from openstackclient.common import exceptions as exc
 from openstackclient.compute import client as compute_client
 from openstackclient.identity import client as identity_client
 from openstackclient.image import client as image_client
diff --git a/openstackclient/common/utils.py b/openstackclient/common/utils.py
index 70555be..c099889 100644
--- a/openstackclient/common/utils.py
+++ b/openstackclient/common/utils.py
@@ -23,8 +23,6 @@ import os
 import sys
 import uuid
 
-import prettytable
-
 from openstackclient.common import exceptions
 
 
diff --git a/openstackclient/openstack/common/setup.py b/openstackclient/openstack/common/setup.py
index e6f72f0..e960002 100644
--- a/openstackclient/openstack/common/setup.py
+++ b/openstackclient/openstack/common/setup.py
@@ -78,10 +78,6 @@ def parse_requirements(requirements_files=['requirements.txt',
         # -f lines are for index locations, and don't get used here
         elif re.match(r'\s*-f\s+', line):
             pass
-        # argparse is part of the standard library starting with 2.7
-        # adding it to the requirements list screws distro installs
-        elif line == 'argparse' and sys.version_info >= (2, 7):
-            pass
         else:
             requirements.append(line)