diff --git a/evaluate.py b/evaluate.py
index 1d0cd41e..4a0218b6 100644
--- a/evaluate.py
+++ b/evaluate.py
@@ -154,7 +154,7 @@ class Instance(Executable):
         """
         names = self.get_self_properties()
 
-        class_names = get_defined_names_for_position(self.base)
+        class_names = self.base.get_defined_names()
         for var in class_names:
             # functions are also instance elements
             if isinstance(var.parent, (parsing.Function, Function)):
@@ -230,24 +230,7 @@ class Class(object):
                     return True
             return False
 
-        """
-        result = []
-        unique_vars = {} #set([n.names[-1] for n in names])
-        for n in self.base.get_defined_names():
-            unique_vars[n.names[-1]] = n
-
-        for key, name in unique_vars.items():
-            scopes = get_scopes_for_name(self.base, key)
-            for s in scopes:
-                n = copy.copy(name)
-                n.parent = s
-                result.append(n)
-            if not scopes:
-                result.append(n)
-        """
-
         result = self.base.get_defined_names()
-
         super_result = []
         for cls in self.get_super_classes():
             # get the inherited names
diff --git a/test/completion/basic.py b/test/completion/basic.py
index c61f1675..e9ccd1d5 100644
--- a/test/completion/basic.py
+++ b/test/completion/basic.py
@@ -43,13 +43,13 @@ for a4, (b4, c4) in (1,("", list)), (1,("", list)):
 # -----------------
 
 with open('') as f:
-    ##? ['closed']
+    #? ['closed']
     f.closed
 
 with open('') as f1, open('') as f2:
-    ##? ['closed']
+    #? ['closed']
     f1.closed
-    ##? ['closed']
+    #? ['closed']
     f2.closed
 
 
diff --git a/test/completion/classes.py b/test/completion/classes.py
index fef8842c..c8acf250 100644
--- a/test/completion/classes.py
+++ b/test/completion/classes.py
@@ -187,5 +187,5 @@ class B():
     def r(self, value):
         pass
 
-##? []
+#? []
 B().r()