diff --git a/ChangeLog b/ChangeLog
index 889b24847..409554db9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-06-15 02:35  Alexander Malmberg <alexander@malmberg.org>
+
+	* Headers/gnustep/gui/GSNibTemplates.h, Source/NSBundleAdditions.m:
+	Remove unused GSFontProxy class.
+
  2003-06-08  David Ayers  <d.ayers@inode.at>
  	
 	* Headers/gnustep/gui/IMConnectors.h: Change syntax of include <>
diff --git a/Headers/gnustep/gui/GSNibTemplates.h b/Headers/gnustep/gui/GSNibTemplates.h
index bf7d0cf98..ee667090b 100644
--- a/Headers/gnustep/gui/GSNibTemplates.h
+++ b/Headers/gnustep/gui/GSNibTemplates.h
@@ -154,9 +154,6 @@
 - (void) setTemplate: (id)template;
 @end
 
-@interface GSFontProxy : NSFont
-@end
-
 /*
 @interface GSStringProxy : NSString
 @end
diff --git a/Source/NSBundleAdditions.m b/Source/NSBundleAdditions.m
index 73b605a32..a29bd04b6 100644
--- a/Source/NSBundleAdditions.m
+++ b/Source/NSBundleAdditions.m
@@ -295,9 +295,6 @@ Class gmodel_class(void)
 		  id	obj;
 		  
 		  // font fallback and automatic translation...
-#if 0
-		  [unarchiver decodeClassName: @"NSFont" asClassName: @"GSFontProxy"];
-#endif
 		  // [unarchiver decodeClassName: @"NSString" asClassName: @"GSStringProxy"];
 
 		  NSDebugLog(@"Invoking unarchiver");
@@ -1565,24 +1562,6 @@ Class gmodel_class(void)
 }
 @end
 
-#if 0
-// Font proxy...
-@implementation GSFontProxy
-- (id) initWithCoder: (NSCoder *)aDecoder
-{
-  id result = [super initWithCoder: aDecoder];
-  NSDebugLog(@"Inside font proxy...");
-  if(result == nil)
-    {
-      NSDebugLog(@"Couldn't find the font specified, so supply a system font instead.");
-      result = [NSFont systemFontOfSize: [NSFont systemFontSize]];
-    }
-
-  return result;
-}
-@end
-#endif
-
 // String proxy for dynamic translation...
 /*
 @implementation GSStringProxy