Merge branch 'pentool' into brushtool

Conflicts:
	imports/codemirror/mode/scheme/scheme.js
	js/tools/BrushTool.js

1 files changed, 0 insertions, 6 deletions

diff --git a/node_modules/montage/ui/component.js b/node_modules/montage/ui/component.js
index e41a1958..d347f655 100755
--- a/node_modules/montage/ui/component.js
+++ b/node_modules/montage/ui/component.js
@@ -6,7 +6,6 @@
 /**
         @module montage/ui/component
     @requires montage/core/core
-    @requires montage/core/event/mutable-event
     @requires montage/ui/reel
     @requires montage/core/gate
     @requires montage/core/logger | component
@@ -14,7 +13,6 @@
     @requires montage/core/event/event-manager
 */
 var Montage = require("montage").Montage,
-    MutableEvent = require("core/event/mutable-event").MutableEvent,
     Template = require("ui/template").Template,
     Gate = require("core/gate").Gate,
     logger = require("core/logger").logger("component"),
@@ -441,10 +439,6 @@ var Component = exports.Component = Montage.create(Montage,/** @lends module:mon
                 childComponents.splice(ix, 1);
                 childComponent._cachedParentComponent = null;
             }
-
-            if (element && element.parentNode) {
-                element.parentNode.removeChild(element);
-            }
         }
     },
 /**