diff --git a/ChangeLog b/ChangeLog
index aab99d36..37f73be6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-05-01 09:03 Gregory John Casamento <greg_casamento@yahoo.com>
+
+	* GormNSMenu.m: [GormNSMenu _createWindow] added call to
+	setExcludedFromWindowsMenu: to make certain that the menu windows
+	are not displayed in the Windows menu under Gorm's main menu.
+	
 2004-05-01 07:10 Gregory John Casamento <greg_casamento@yahoo.com>
 
 	* GormClassManager.m: Removed some NSLog messages.
diff --git a/Palettes/0Menus/GormNSMenu.m b/Palettes/0Menus/GormNSMenu.m
index 35b5a9db..671de12f 100644
--- a/Palettes/0Menus/GormNSMenu.m
+++ b/Palettes/0Menus/GormNSMenu.m
@@ -49,11 +49,6 @@
 @end
 
 @implementation GormNSMenuWindow
-- (BOOL)isExcludedFromWindowsMenu
-{
-  return YES;
-}
-
 - (BOOL)canBecomeMainWindow
 {
   return YES;
@@ -114,24 +109,6 @@
 }
 @end
 
-/*
-@interface NSMenu (GormAdditions)
-- (NSWindow *)_bWindow;
-- (void) _setBwindow: (NSWindow *)win;
-@end
-
-@implementation NSMenu (GormAdditions)
-- (NSWindow *)_bWindow
-{
-  return _bWindow;
-}
-- (void) _setBwindow: (NSWindow *)win
-{
-  _bWindow = win;
-}
-@end
-*/
-
 @implementation GormNSMenu
 - (BOOL) performKeyEquivalent: (NSEvent*)theEvent
 {
@@ -148,58 +125,17 @@
  
   [win setMenu: self];
   [win setLevel: NSSubmenuWindowLevel];
-  // [win setWorksWhenModal: NO];
-  // [win setBecomesKeyOnlyIfNeeded: YES];
+  [win setExcludedFromWindowsMenu: YES];
 
   return win;
 }
 
-/*
-- (void) awakeFromDocument: (id)document
-{
-  NSWindow *win = [self _bWindow];
-  [win close];
-  RELEASE(win);
-  [self _setBwindow: nil];
-}
-*/
-
 - (NSString *)className
 {
   return @"NSMenu";
 }
-
-/*
-- (void) display
-{
-  NSLog(@"Display...");
-  [super display];
-}
-*/
 @end
 
-/*
-@interface GormNSMenu (GNUstepExtra)
-- (void) setTornOff: (BOOL)flag;
-- (void) _showTornOffMenuIfAny: (NSNotification*)notification;
-- (void) _showOnActivateApp: (NSNotification*)notification;
-@end
-
-@implementation GormNSMenu (GNUstepExtra)
-- (void) setTornOff: (BOOL)flag
-{
-}
-
-- (void) _showTornOffMenuIfAny: (NSNotification*)notification
-{
-}
-
-- (void) _showOnActivateApp: (NSNotification*)notification
-{
-}
-@end
-*/
-
 @implementation NSMenu (GormNSMenu)
 + (id) allocSubstitute
 {