From 53b456dff2e777a5244343458bd2676698838821 Mon Sep 17 00:00:00 2001
From: Dave Halter <davidhalter88@gmail.com>
Date: Fri, 9 Jan 2015 01:55:23 +0100
Subject: [PATCH] Cleaning up.

---
 jedi/evaluate/representation.py | 27 +++++----------------------
 1 file changed, 5 insertions(+), 22 deletions(-)

diff --git a/jedi/evaluate/representation.py b/jedi/evaluate/representation.py
index 42dc90cf..8b921ab5 100644
--- a/jedi/evaluate/representation.py
+++ b/jedi/evaluate/representation.py
@@ -273,13 +273,11 @@ def get_instance_el(evaluator, instance, var, is_class_var=False):
     Returns an InstanceElement if it makes sense, otherwise leaves the object
     untouched.
     """
-    if isinstance(var, (Instance, compiled.CompiledObject, pr.Leaf,
-                        pr.Module, FunctionExecution, pr.Name)):
-        if isinstance(var, pr.Name):
-            # TODO temp solution, remove later, Name should never get
-            #     here?
-            parent = get_instance_el(evaluator, instance, var.parent, is_class_var)
-            return InstanceName(var, parent)
+    if isinstance(var, pr.Name):
+        parent = get_instance_el(evaluator, instance, var.parent, is_class_var)
+        return InstanceName(var, parent)
+    elif isinstance(var, (Instance, compiled.CompiledObject, pr.Leaf,
+                          pr.Module, FunctionExecution)):
         return var
 
     var = wrap(evaluator, var)
@@ -311,9 +309,6 @@ class InstanceElement(use_metaclass(CachedMetaClass, pr.Base)):
         return par
 
     def get_parent_until(self, *args, **kwargs):
-        if isinstance(self.var, pr.Name):
-            # TODO Name should never even be InstanceElements
-            return pr.Simple.get_parent_until(self.parent, *args, **kwargs)
         return pr.Simple.get_parent_until(self, *args, **kwargs)
 
     def get_definition(self):
@@ -670,18 +665,6 @@ class FunctionExecution(Executed):
     def yields(self):
         return self._copy_list(self.base.yields)
 
-    """
-    @common.safe_property
-    @memoize_default([])
-    def children(self):
-        helpers.deep_ast_copy(self.base.base_func, self._copy_dict, check_first=True)
-        if isinstance(self.base, InstanceElement):
-            children = self.base.var.children
-        else:
-            children = self.base.children
-        return self._copy_list(children)
-    """
-
     @common.safe_property
     @memoize_default([])
     def asserts(self):