1 files changed, 2 insertions, 14 deletions
diff --git a/csharp/ProtocolBuffers/GeneratedMessage.cs b/csharp/ProtocolBuffers/GeneratedMessage.cs
index 37fd2e6b..0bdf0e3f 100644
--- a/csharp/ProtocolBuffers/GeneratedMessage.cs
+++ b/csharp/ProtocolBuffers/GeneratedMessage.cs
@@ -13,9 +13,9 @@ namespace Google.ProtocolBuffers {
   /// most of the IMessage interface using reflection. Users
   /// can ignore this class as an implementation detail.
   /// </summary>
-  public abstract class GeneratedMessage<TMessage, TBuilder> : AbstractMessage, IMessage<TMessage>
+  public abstract class GeneratedMessage<TMessage, TBuilder> : AbstractMessage<TMessage, TBuilder>
       where TMessage : GeneratedMessage<TMessage, TBuilder> 
-      where TBuilder : IBuilder<TMessage> {
+      where TBuilder : GeneratedBuilder<TMessage, TBuilder> {
 
     private UnknownFieldSet unknownFields = UnknownFieldSet.DefaultInstance;
 
@@ -29,18 +29,6 @@ namespace Google.ProtocolBuffers {
       get { return InternalFieldAccessors.Descriptor; }
     }
 
-    protected override IMessage DefaultInstanceForTypeImpl {
-      get { return DefaultInstanceForType; }
-    }
-
-    protected override IBuilder CreateBuilderForTypeImpl() {
-      return CreateBuilderForType();
-    }
-
-    public abstract TMessage DefaultInstanceForType { get; }
-
-    public abstract IBuilder<TMessage> CreateBuilderForType();
-
     internal IDictionary<FieldDescriptor, Object> GetMutableFieldMap() {
 
       // Use a SortedList so we'll end up serializing fields in order