diff --git a/src/core/completions.py b/src/core/completions.py
index 68cbb24a..f17e916c 100644
--- a/src/core/completions.py
+++ b/src/core/completions.py
@@ -118,7 +118,6 @@ def completion_join(self, the_input):
         return the_input.new_completion(['/%s' % self.own_nick], 1, quotify=True)
     else:
         return the_input.new_completion(relevant_rooms, 1, quotify=True)
-    return True
 
 
 def completion_version(self, the_input):
@@ -213,9 +212,6 @@ def completion_bind(self, the_input):
     return the_input.new_completion(args, n, '', quotify=False)
 
 
-    return the_input
-
-
 def completion_message(self, the_input):
     """Completion for /message"""
     n = the_input.get_argument_position(quoted=True)
diff --git a/src/tabs/basetabs.py b/src/tabs/basetabs.py
index 184a9243..1938cb65 100644
--- a/src/tabs/basetabs.py
+++ b/src/tabs/basetabs.py
@@ -254,7 +254,6 @@ class Tab(object):
                     return False # There's no completion function
                 else:
                     return command[2](the_input)
-                return True
         return False
 
     def execute_command(self, provided_text):