diff --git a/jedi/api/__init__.py b/jedi/api/__init__.py
index 34276ca6..3b1760f7 100644
--- a/jedi/api/__init__.py
+++ b/jedi/api/__init__.py
@@ -249,14 +249,12 @@ class Script(object):
             completions = []
             debug.dbg('possible completion scopes: %s', scopes)
             for s in scopes:
-                if s.isinstance(er.Function):
-                    names = s.get_magic_function_names()
-                else:
-                    names = []
-                    for names_dict in s.names_dicts(search_global=False):
-                        names += chain.from_iterable(names_dict.values())
+                names = []
+                for names_dict in s.names_dicts(search_global=False):
+                    names += chain.from_iterable(names_dict.values())
+
+                names = filter_definition_names(names, self._parser.user_stmt())
 
-                    names = filter_definition_names(names, self._parser.user_stmt())
                 for c in names:
                     completions.append((c, s))
         return completions
diff --git a/jedi/evaluate/representation.py b/jedi/evaluate/representation.py
index b7e7f8a7..7ebe7721 100644
--- a/jedi/evaluate/representation.py
+++ b/jedi/evaluate/representation.py
@@ -575,12 +575,6 @@ class Function(use_metaclass(CachedMetaClass, Wrapper)):
             for names_dict in compiled.magic_function_class.names_dicts(False):
                 yield names_dict
 
-    def get_magic_function_names(self):
-        return compiled.magic_function_class.get_defined_names()
-
-    def get_magic_function_scope(self):
-        return compiled.magic_function_class
-
     @Python3Method
     def py__call__(self, evaluator, params):
         if self.base.is_generator():