diff --git a/ChangeLog b/ChangeLog
index 5e5e50aaf..d5ed96cec 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-12-26  Mike Kestner  <mkestner@novell.com>
+
+	* generator/CustomMarshalerGen.cs : kill bad idea unused class.
+	* generator/Makefile.am : remove CustomMarshalerGen.cs.
+	* generator/Method.cs : remove CustomMarshalerGen reference.
+
 2004-12-26  Mike Kestner  <mkestner@novell.com>
 
 	* generator/*Gen.cs : implement IGeneratable fully on GenBase
diff --git a/generator/CustomMarshalerGen.cs b/generator/CustomMarshalerGen.cs
deleted file mode 100644
index d45f5f958..000000000
--- a/generator/CustomMarshalerGen.cs
+++ /dev/null
@@ -1,104 +0,0 @@
-// GtkSharp.Generation.CustomMarshalerGen.cs - The CustomMarshaler type Generatable.
-//
-// Author: Mike Kestner <mkestner@ximian.com>
-//
-// Copyright (c) 2004 Novell, Inc.
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of version 2 of the GNU General Public
-// License as published by the Free Software Foundation.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-//
-// You should have received a copy of the GNU General Public
-// License along with this program; if not, write to the
-// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-// Boston, MA 02111-1307, USA.
-
-
-namespace GtkSharp.Generation {
-
-	using System;
-
-	public class CustomMarshalerGen : IGeneratable  {
-		
-		string type;
-		string ctype;
-		string marshaler;
-
-		public CustomMarshalerGen (string ctype, string type, string marshaler)
-		{
-			this.ctype = ctype;
-			this.type = type;
-			this.marshaler = marshaler;
-		}
-		
-		public string CName {
-			get {
-				return ctype;
-			}
-		}
-
-		public string Name {
-			get {
-				return type;
-			}
-		}
-
-		public string QualifiedName {
-			get {
-				return type;
-			}
-		}
-
-		public string MarshalType {
-			get {
-				return "[MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef=typeof(" + marshaler + "))] " + type;
-			}
-		}
-
-		public virtual string MarshalReturnType {
-			get {
-				return "[return:MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef=typeof(" + marshaler + "))]";
-			}
-		}
-
-		public virtual string ToNativeReturnType {
-			get {
-				return "[return:MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef=typeof(" + marshaler + "))]";
-			}
-		}
-
-		public string CallByName (string var_name)
-		{
-			return var_name;
-		}
-		
-		public string FromNative(string var)
-		{
-			return String.Empty;
-		}
-		
-		public virtual string FromNativeReturn(string var)
-		{	
-			return String.Empty;
-		}
-
-		public virtual string ToNativeReturn(string var)
-		{
-			return String.Empty;
-		}
-
-		public void Generate ()
-		{
-		}
-		
-		public void Generate (GenerationInfo gen_info)
-		{
-		}
-	}
-}
-
diff --git a/generator/Makefile.am b/generator/Makefile.am
index e4efe48f4..46fc61e95 100644
--- a/generator/Makefile.am
+++ b/generator/Makefile.am
@@ -17,7 +17,6 @@ sources = 				\
 	CodeGenerator.cs		\
 	ConstStringGen.cs		\
 	Ctor.cs				\
-	CustomMarshalerGen.cs		\
 	EnumGen.cs			\
 	Field.cs			\
 	GenBase.cs			\
diff --git a/generator/Method.cs b/generator/Method.cs
index 7c255678d..c67dbfb0e 100644
--- a/generator/Method.cs
+++ b/generator/Method.cs
@@ -391,8 +391,6 @@ namespace GtkSharp.Generation {
 				sw.WriteLine(indent + "\t\t\t\tret = null;");
 				sw.WriteLine(indent + "\t\t\telse");
 				sw.WriteLine(indent +"\t\t\t\tret = " + table.FromNativeReturn(retval.CType, "raw_ret") + ";");
-			} else if (ret_igen is CustomMarshalerGen) {
-				sw.WriteLine(retval.CSType + " ret = " + CName + call + ";");
 			} else {
 				sw.WriteLine(retval.MarshalType + " raw_ret = " + CName + call + ";");
 				sw.Write(indent + "\t\t\t");