Index: javax/swing/JComponent.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/JComponent.java,v
retrieving revision 1.83
diff -u -r1.83 JComponent.java
--- javax/swing/JComponent.java	10 Nov 2005 20:03:55 -0000	1.83
+++ javax/swing/JComponent.java	14 Nov 2005 20:53:25 -0000
@@ -2921,37 +2921,14 @@
   {
     super.removeNotify();
 
-    // let parents inherit the keybord mapping
-    InputMap input = getInputMap();
-    ActionMap actions = getActionMap();
-
-    Container parent = getParent();
-    while ((parent != null) && (parent instanceof JComponent))
-      {
-        JComponent jParent = (JComponent) parent;
-        InputMap parentInput = jParent.getInputMap();
-        ActionMap parentAction = jParent.getActionMap();
-
-        KeyStroke[] ikeys = input.allKeys();
-        for (int i = 0; i < ikeys.length; i++)
-          {
-            parentInput.remove(ikeys[i]);
-          }
-
-        Object[] akeys = actions.allKeys();
-        for (int i = 0; i < akeys.length; i++)
-          {
-            parentAction.remove(akeys[i]);
-          }
-
-        parent = jParent.getParent();
-      }
-
+    // FIXME: remove the WHEN_IN_FOCUSED_WINDOW bindings from the 
+    // KeyboardManager
+    
     // Notify ancestor listeners.
     fireAncestorEvent(this, AncestorEvent.ANCESTOR_REMOVED);
 
     // fire property change event for 'ancestor'
-    firePropertyChange("ancestor", parent, null);
+    firePropertyChange("ancestor", getParent(), null);
   }
 
   /**
Index: javax/swing/JMenuBar.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/JMenuBar.java,v
retrieving revision 1.19
diff -u -r1.19 JMenuBar.java
--- javax/swing/JMenuBar.java	14 Nov 2005 20:23:56 -0000	1.19
+++ javax/swing/JMenuBar.java	14 Nov 2005 20:53:25 -0000
@@ -551,7 +551,7 @@
    */
   public void removeNotify()
   {
-    // Must unregister this menu bar with the current keyboard manager.
+    // FIXME: Must unregister this menu bar with the current keyboard manager.
     super.removeNotify();
   }