                     hideModalWindow(o, true);
                     realSm.numModalWindows--;
                 }
-                
-                // non-modal
-                else
-                {
-                    realSm.removeEventListener(MouseEvent.MOUSE_DOWN,  o.mouseDownOutsideHandler);
-                    realSm.removeEventListener(MouseEvent.MOUSE_WHEEL, o.mouseWheelOutsideHandler, true);
-                }
-                
-                realSm.removeEventListener(MarshalMouseEvent.MOUSE_DOWN,  o.marshalMouseOutsideHandler);
-                realSm.removeEventListener(MarshalMouseEvent.MOUSE_WHEEL, o.marshalMouseOutsideHandler, true);
-                
+
                 popupInfo.splice(i, 1);
                 break;
             }

        return null;
    }

    //--------------------------------------------------------------------------
    //
    //  Event handlers
    //
    //--------------------------------------------------------------------------

    /**
     *  @private

        
        const visibleFlag:Boolean = window.visible;
        
		if (parent is IUIComponent && window is IUIComponent &&
			IUIComponent(window).document == null)
			IUIComponent(window).document = IUIComponent(parent).document;

		if (parent is IUIComponent && IUIComponent(parent).document is IFlexModule &&
			window is UIComponent && UIComponent(window).moduleFactory == null)
			UIComponent(window).moduleFactory = IFlexModule(IUIComponent(parent).document).moduleFactory;

        var sm:ISystemManager2 = getTopLevelSystemManager(parent);
        var children:IChildList;
        var topMost:Boolean;
