diff --git a/letsencrypt/client/augeas_configurator.py b/letsencrypt/client/augeas_configurator.py
index 1b7c9f9ce..d66b42234 100644
--- a/letsencrypt/client/augeas_configurator.py
+++ b/letsencrypt/client/augeas_configurator.py
@@ -217,7 +217,7 @@ class AugeasConfigurator(configurator.Configurator):
         try:
             os.rename(cp_dir, final_dir)
         except:
-            logger.error("Unable to finalize checkpoint, %s -> %s" % cp_dir, final_dir)
+            logger.error("Unable to finalize checkpoint, %s -> %s" % (cp_dir, final_dir))
             return False
         return True
 
diff --git a/letsencrypt/client/client.py b/letsencrypt/client/client.py
index 401cc2963..eff28bbb3 100644
--- a/letsencrypt/client/client.py
+++ b/letsencrypt/client/client.py
@@ -624,16 +624,16 @@ class Client(object):
         return key_pem, csr_pem
 
 
-    def choice_of_ca(self):
-        choices = self.get_cas()
-        message = "Pick a Certificate Authority.  They're all unique and special!"
-        in_txt = "Enter the number of a Certificate Authority (c to cancel): "
-        code, selection = display.generic_menu(message, choices, in_txt)
+    # def choice_of_ca(self):
+    #     choices = self.get_cas()
+    #     message = "Pick a Certificate Authority.  They're all unique and special!"
+    #     in_txt = "Enter the number of a Certificate Authority (c to cancel): "
+    #     code, selection = display.generic_menu(message, choices, in_txt)
 
-        if code != display.OK:
-            sys.exit(0)
+    #     if code != display.OK:
+    #         sys.exit(0)
 
-        return selection
+    #     return selection
 
     # Legacy Code: Although I would like to see a free and open marketplace
     # in the future. The Let's Encrypt Client will not have this feature at
diff --git a/letsencrypt/client/interactive_challenge.py b/letsencrypt/client/interactive_challenge.py
index 467403328..720a0381d 100644
--- a/letsencrypt/client/interactive_challenge.py
+++ b/letsencrypt/client/interactive_challenge.py
@@ -31,5 +31,5 @@ class Interactive_Challenge(challenge.Challenge):
     def get_display_string(self):
         return textwrap.fill(self.string, width=self.BOX_SIZE) + "\n\nPlease Press Enter to Continue"
 
-    def formatted_reasons(self):
-        return "\n\t* %s\n", self.reason
+    # def formatted_reasons(self):
+    #    return "\n\t* %s\n", self.reason