diff --git a/myproxy/client/utils/__init__.py b/myproxy/client/utils/__init__.py
index a3b210a..72b5589 100644
--- a/myproxy/client/utils/__init__.py
+++ b/myproxy/client/utils/__init__.py
@@ -8,14 +8,14 @@
 __copyright__ = "Copyright 2018 United Kingdom Research and Innovation"
 __license__ = """BSD - See LICENSE file in top-level package directory"""
 __contact__ = "Philip.Kershaw@stfc.ac.uk"
-from six.moves.configparser import SafeConfigParser
+from configparser import ConfigParser
 
 
-class CaseSensitiveConfigParser(SafeConfigParser):
+class CaseSensitiveConfigParser(ConfigParser):
     '''Subclass the SafeConfigParser - to preserve the original string case of
     config section names
     '''
     def optionxform(self, optionstr):
-        '''Extend SafeConfigParser.optionxform to preserve case of option names
+        '''Extend ConfigParser.optionxform to preserve case of option names
         '''
         return optionstr
diff --git a/myproxy/client/utils/openssl.py b/myproxy/client/utils/openssl.py
index 345f4eb..93ac695 100644
--- a/myproxy/client/utils/openssl.py
+++ b/myproxy/client/utils/openssl.py
@@ -12,14 +12,14 @@
 import os
 
 import six
-from six.moves.configparser import SafeConfigParser
+from configparser import ConfigParser
 
 
 class OpenSSLConfigError(Exception):
     """Exceptions related to OpenSSLConfig class"""
 
 
-class OpenSSLConfig(SafeConfigParser, object):
+class OpenSSLConfig(ConfigParser, object):
     """Wrapper to OpenSSL Configuration file to allow extraction of
     required distinguished name used for making certificate requests