diff --git a/ruby/lib/google/protobuf/any_pb.rb b/ruby/lib/google/protobuf/any_pb.rb
deleted file mode 100644
index 88d2c12b8a..0000000000
--- a/ruby/lib/google/protobuf/any_pb.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: google/protobuf/any.proto
-
-require 'google/protobuf'
-
-Google::Protobuf::DescriptorPool.generated_pool.build do
-  add_message "google.protobuf.Any" do
-    optional :type_url, :string, 1
-    optional :value, :bytes, 2
-  end
-end
-
-module Google
-  module Protobuf
-    Any = Google::Protobuf::DescriptorPool.generated_pool.lookup("google.protobuf.Any").msgclass
-  end
-end
diff --git a/ruby/lib/google/protobuf/api_pb.rb b/ruby/lib/google/protobuf/api_pb.rb
deleted file mode 100644
index 1676b58750..0000000000
--- a/ruby/lib/google/protobuf/api_pb.rb
+++ /dev/null
@@ -1,39 +0,0 @@
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: google/protobuf/api.proto
-
-require 'google/protobuf'
-
-require 'google/protobuf/source_context_pb'
-require 'google/protobuf/type_pb'
-Google::Protobuf::DescriptorPool.generated_pool.build do
-  add_message "google.protobuf.Api" do
-    optional :name, :string, 1
-    repeated :methods, :message, 2, "google.protobuf.Method"
-    repeated :options, :message, 3, "google.protobuf.Option"
-    optional :version, :string, 4
-    optional :source_context, :message, 5, "google.protobuf.SourceContext"
-    repeated :mixins, :message, 6, "google.protobuf.Mixin"
-    optional :syntax, :enum, 7, "google.protobuf.Syntax"
-  end
-  add_message "google.protobuf.Method" do
-    optional :name, :string, 1
-    optional :request_type_url, :string, 2
-    optional :request_streaming, :bool, 3
-    optional :response_type_url, :string, 4
-    optional :response_streaming, :bool, 5
-    repeated :options, :message, 6, "google.protobuf.Option"
-    optional :syntax, :enum, 7, "google.protobuf.Syntax"
-  end
-  add_message "google.protobuf.Mixin" do
-    optional :name, :string, 1
-    optional :root, :string, 2
-  end
-end
-
-module Google
-  module Protobuf
-    Api = Google::Protobuf::DescriptorPool.generated_pool.lookup("google.protobuf.Api").msgclass
-    Method = Google::Protobuf::DescriptorPool.generated_pool.lookup("google.protobuf.Method").msgclass
-    Mixin = Google::Protobuf::DescriptorPool.generated_pool.lookup("google.protobuf.Mixin").msgclass
-  end
-end
diff --git a/ruby/lib/google/protobuf/duration_pb.rb b/ruby/lib/google/protobuf/duration_pb.rb
deleted file mode 100644
index c93f5987d2..0000000000
--- a/ruby/lib/google/protobuf/duration_pb.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: google/protobuf/duration.proto
-
-require 'google/protobuf'
-
-Google::Protobuf::DescriptorPool.generated_pool.build do
-  add_message "google.protobuf.Duration" do
-    optional :seconds, :int64, 1
-    optional :nanos, :int32, 2
-  end
-end
-
-module Google
-  module Protobuf
-    Duration = Google::Protobuf::DescriptorPool.generated_pool.lookup("google.protobuf.Duration").msgclass
-  end
-end
diff --git a/ruby/lib/google/protobuf/empty_pb.rb b/ruby/lib/google/protobuf/empty_pb.rb
deleted file mode 100644
index 580db6ddbf..0000000000
--- a/ruby/lib/google/protobuf/empty_pb.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: google/protobuf/empty.proto
-
-require 'google/protobuf'
-
-Google::Protobuf::DescriptorPool.generated_pool.build do
-  add_message "google.protobuf.Empty" do
-  end
-end
-
-module Google
-  module Protobuf
-    Empty = Google::Protobuf::DescriptorPool.generated_pool.lookup("google.protobuf.Empty").msgclass
-  end
-end
diff --git a/ruby/lib/google/protobuf/field_mask_pb.rb b/ruby/lib/google/protobuf/field_mask_pb.rb
deleted file mode 100644
index ea2811abd6..0000000000
--- a/ruby/lib/google/protobuf/field_mask_pb.rb
+++ /dev/null
@@ -1,16 +0,0 @@
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: google/protobuf/field_mask.proto
-
-require 'google/protobuf'
-
-Google::Protobuf::DescriptorPool.generated_pool.build do
-  add_message "google.protobuf.FieldMask" do
-    repeated :paths, :string, 1
-  end
-end
-
-module Google
-  module Protobuf
-    FieldMask = Google::Protobuf::DescriptorPool.generated_pool.lookup("google.protobuf.FieldMask").msgclass
-  end
-end
diff --git a/ruby/lib/google/protobuf/source_context_pb.rb b/ruby/lib/google/protobuf/source_context_pb.rb
deleted file mode 100644
index d099d0ea98..0000000000
--- a/ruby/lib/google/protobuf/source_context_pb.rb
+++ /dev/null
@@ -1,16 +0,0 @@
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: google/protobuf/source_context.proto
-
-require 'google/protobuf'
-
-Google::Protobuf::DescriptorPool.generated_pool.build do
-  add_message "google.protobuf.SourceContext" do
-    optional :file_name, :string, 1
-  end
-end
-
-module Google
-  module Protobuf
-    SourceContext = Google::Protobuf::DescriptorPool.generated_pool.lookup("google.protobuf.SourceContext").msgclass
-  end
-end
diff --git a/ruby/lib/google/protobuf/struct_pb.rb b/ruby/lib/google/protobuf/struct_pb.rb
deleted file mode 100644
index af53c6e161..0000000000
--- a/ruby/lib/google/protobuf/struct_pb.rb
+++ /dev/null
@@ -1,35 +0,0 @@
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: google/protobuf/struct.proto
-
-require 'google/protobuf'
-
-Google::Protobuf::DescriptorPool.generated_pool.build do
-  add_message "google.protobuf.Struct" do
-    map :fields, :string, :message, 1, "google.protobuf.Value"
-  end
-  add_message "google.protobuf.Value" do
-    oneof :kind do
-      optional :null_value, :enum, 1, "google.protobuf.NullValue"
-      optional :number_value, :double, 2
-      optional :string_value, :string, 3
-      optional :bool_value, :bool, 4
-      optional :struct_value, :message, 5, "google.protobuf.Struct"
-      optional :list_value, :message, 6, "google.protobuf.ListValue"
-    end
-  end
-  add_message "google.protobuf.ListValue" do
-    repeated :values, :message, 1, "google.protobuf.Value"
-  end
-  add_enum "google.protobuf.NullValue" do
-    value :NULL_VALUE, 0
-  end
-end
-
-module Google
-  module Protobuf
-    Struct = Google::Protobuf::DescriptorPool.generated_pool.lookup("google.protobuf.Struct").msgclass
-    Value = Google::Protobuf::DescriptorPool.generated_pool.lookup("google.protobuf.Value").msgclass
-    ListValue = Google::Protobuf::DescriptorPool.generated_pool.lookup("google.protobuf.ListValue").msgclass
-    NullValue = Google::Protobuf::DescriptorPool.generated_pool.lookup("google.protobuf.NullValue").enummodule
-  end
-end
diff --git a/ruby/lib/google/protobuf/timestamp_pb.rb b/ruby/lib/google/protobuf/timestamp_pb.rb
deleted file mode 100644
index 7af3333980..0000000000
--- a/ruby/lib/google/protobuf/timestamp_pb.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: google/protobuf/timestamp.proto
-
-require 'google/protobuf'
-
-Google::Protobuf::DescriptorPool.generated_pool.build do
-  add_message "google.protobuf.Timestamp" do
-    optional :seconds, :int64, 1
-    optional :nanos, :int32, 2
-  end
-end
-
-module Google
-  module Protobuf
-    Timestamp = Google::Protobuf::DescriptorPool.generated_pool.lookup("google.protobuf.Timestamp").msgclass
-  end
-end
diff --git a/ruby/lib/google/protobuf/type_pb.rb b/ruby/lib/google/protobuf/type_pb.rb
deleted file mode 100644
index ffcbb9deb6..0000000000
--- a/ruby/lib/google/protobuf/type_pb.rb
+++ /dev/null
@@ -1,89 +0,0 @@
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: google/protobuf/type.proto
-
-require 'google/protobuf'
-
-require 'google/protobuf/any_pb'
-require 'google/protobuf/source_context_pb'
-Google::Protobuf::DescriptorPool.generated_pool.build do
-  add_message "google.protobuf.Type" do
-    optional :name, :string, 1
-    repeated :fields, :message, 2, "google.protobuf.Field"
-    repeated :oneofs, :string, 3
-    repeated :options, :message, 4, "google.protobuf.Option"
-    optional :source_context, :message, 5, "google.protobuf.SourceContext"
-    optional :syntax, :enum, 6, "google.protobuf.Syntax"
-  end
-  add_message "google.protobuf.Field" do
-    optional :kind, :enum, 1, "google.protobuf.Field.Kind"
-    optional :cardinality, :enum, 2, "google.protobuf.Field.Cardinality"
-    optional :number, :int32, 3
-    optional :name, :string, 4
-    optional :type_url, :string, 6
-    optional :oneof_index, :int32, 7
-    optional :packed, :bool, 8
-    repeated :options, :message, 9, "google.protobuf.Option"
-    optional :json_name, :string, 10
-    optional :default_value, :string, 11
-  end
-  add_enum "google.protobuf.Field.Kind" do
-    value :TYPE_UNKNOWN, 0
-    value :TYPE_DOUBLE, 1
-    value :TYPE_FLOAT, 2
-    value :TYPE_INT64, 3
-    value :TYPE_UINT64, 4
-    value :TYPE_INT32, 5
-    value :TYPE_FIXED64, 6
-    value :TYPE_FIXED32, 7
-    value :TYPE_BOOL, 8
-    value :TYPE_STRING, 9
-    value :TYPE_GROUP, 10
-    value :TYPE_MESSAGE, 11
-    value :TYPE_BYTES, 12
-    value :TYPE_UINT32, 13
-    value :TYPE_ENUM, 14
-    value :TYPE_SFIXED32, 15
-    value :TYPE_SFIXED64, 16
-    value :TYPE_SINT32, 17
-    value :TYPE_SINT64, 18
-  end
-  add_enum "google.protobuf.Field.Cardinality" do
-    value :CARDINALITY_UNKNOWN, 0
-    value :CARDINALITY_OPTIONAL, 1
-    value :CARDINALITY_REQUIRED, 2
-    value :CARDINALITY_REPEATED, 3
-  end
-  add_message "google.protobuf.Enum" do
-    optional :name, :string, 1
-    repeated :enumvalue, :message, 2, "google.protobuf.EnumValue"
-    repeated :options, :message, 3, "google.protobuf.Option"
-    optional :source_context, :message, 4, "google.protobuf.SourceContext"
-    optional :syntax, :enum, 5, "google.protobuf.Syntax"
-  end
-  add_message "google.protobuf.EnumValue" do
-    optional :name, :string, 1
-    optional :number, :int32, 2
-    repeated :options, :message, 3, "google.protobuf.Option"
-  end
-  add_message "google.protobuf.Option" do
-    optional :name, :string, 1
-    optional :value, :message, 2, "google.protobuf.Any"
-  end
-  add_enum "google.protobuf.Syntax" do
-    value :SYNTAX_PROTO2, 0
-    value :SYNTAX_PROTO3, 1
-  end
-end
-
-module Google
-  module Protobuf
-    Type = Google::Protobuf::DescriptorPool.generated_pool.lookup("google.protobuf.Type").msgclass
-    Field = Google::Protobuf::DescriptorPool.generated_pool.lookup("google.protobuf.Field").msgclass
-    Field::Kind = Google::Protobuf::DescriptorPool.generated_pool.lookup("google.protobuf.Field.Kind").enummodule
-    Field::Cardinality = Google::Protobuf::DescriptorPool.generated_pool.lookup("google.protobuf.Field.Cardinality").enummodule
-    Enum = Google::Protobuf::DescriptorPool.generated_pool.lookup("google.protobuf.Enum").msgclass
-    EnumValue = Google::Protobuf::DescriptorPool.generated_pool.lookup("google.protobuf.EnumValue").msgclass
-    Option = Google::Protobuf::DescriptorPool.generated_pool.lookup("google.protobuf.Option").msgclass
-    Syntax = Google::Protobuf::DescriptorPool.generated_pool.lookup("google.protobuf.Syntax").enummodule
-  end
-end
diff --git a/ruby/lib/google/protobuf/wrappers_pb.rb b/ruby/lib/google/protobuf/wrappers_pb.rb
deleted file mode 100644
index e26a4d23c6..0000000000
--- a/ruby/lib/google/protobuf/wrappers_pb.rb
+++ /dev/null
@@ -1,48 +0,0 @@
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: google/protobuf/wrappers.proto
-
-require 'google/protobuf'
-
-Google::Protobuf::DescriptorPool.generated_pool.build do
-  add_message "google.protobuf.DoubleValue" do
-    optional :value, :double, 1
-  end
-  add_message "google.protobuf.FloatValue" do
-    optional :value, :float, 1
-  end
-  add_message "google.protobuf.Int64Value" do
-    optional :value, :int64, 1
-  end
-  add_message "google.protobuf.UInt64Value" do
-    optional :value, :uint64, 1
-  end
-  add_message "google.protobuf.Int32Value" do
-    optional :value, :int32, 1
-  end
-  add_message "google.protobuf.UInt32Value" do
-    optional :value, :uint32, 1
-  end
-  add_message "google.protobuf.BoolValue" do
-    optional :value, :bool, 1
-  end
-  add_message "google.protobuf.StringValue" do
-    optional :value, :string, 1
-  end
-  add_message "google.protobuf.BytesValue" do
-    optional :value, :bytes, 1
-  end
-end
-
-module Google
-  module Protobuf
-    DoubleValue = Google::Protobuf::DescriptorPool.generated_pool.lookup("google.protobuf.DoubleValue").msgclass
-    FloatValue = Google::Protobuf::DescriptorPool.generated_pool.lookup("google.protobuf.FloatValue").msgclass
-    Int64Value = Google::Protobuf::DescriptorPool.generated_pool.lookup("google.protobuf.Int64Value").msgclass
-    UInt64Value = Google::Protobuf::DescriptorPool.generated_pool.lookup("google.protobuf.UInt64Value").msgclass
-    Int32Value = Google::Protobuf::DescriptorPool.generated_pool.lookup("google.protobuf.Int32Value").msgclass
-    UInt32Value = Google::Protobuf::DescriptorPool.generated_pool.lookup("google.protobuf.UInt32Value").msgclass
-    BoolValue = Google::Protobuf::DescriptorPool.generated_pool.lookup("google.protobuf.BoolValue").msgclass
-    StringValue = Google::Protobuf::DescriptorPool.generated_pool.lookup("google.protobuf.StringValue").msgclass
-    BytesValue = Google::Protobuf::DescriptorPool.generated_pool.lookup("google.protobuf.BytesValue").msgclass
-  end
-end
diff --git a/ruby/tests/generated_code_pb.rb b/ruby/tests/generated_code_pb.rb
deleted file mode 100644
index 0358ada781..0000000000
--- a/ruby/tests/generated_code_pb.rb
+++ /dev/null
@@ -1,74 +0,0 @@
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: tests/generated_code.proto
-
-require 'google/protobuf'
-
-Google::Protobuf::DescriptorPool.generated_pool.build do
-  add_message "a.b.c.TestMessage" do
-    optional :optional_int32, :int32, 1
-    optional :optional_int64, :int64, 2
-    optional :optional_uint32, :uint32, 3
-    optional :optional_uint64, :uint64, 4
-    optional :optional_bool, :bool, 5
-    optional :optional_double, :double, 6
-    optional :optional_float, :float, 7
-    optional :optional_string, :string, 8
-    optional :optional_bytes, :bytes, 9
-    optional :optional_enum, :enum, 10, "a.b.c.TestEnum"
-    optional :optional_msg, :message, 11, "a.b.c.TestMessage"
-    repeated :repeated_int32, :int32, 21
-    repeated :repeated_int64, :int64, 22
-    repeated :repeated_uint32, :uint32, 23
-    repeated :repeated_uint64, :uint64, 24
-    repeated :repeated_bool, :bool, 25
-    repeated :repeated_double, :double, 26
-    repeated :repeated_float, :float, 27
-    repeated :repeated_string, :string, 28
-    repeated :repeated_bytes, :bytes, 29
-    repeated :repeated_enum, :enum, 30, "a.b.c.TestEnum"
-    repeated :repeated_msg, :message, 31, "a.b.c.TestMessage"
-    map :map_int32_string, :int32, :string, 61
-    map :map_int64_string, :int64, :string, 62
-    map :map_uint32_string, :uint32, :string, 63
-    map :map_uint64_string, :uint64, :string, 64
-    map :map_bool_string, :bool, :string, 65
-    map :map_string_string, :string, :string, 66
-    map :map_string_msg, :string, :message, 67, "a.b.c.TestMessage"
-    map :map_string_enum, :string, :enum, 68, "a.b.c.TestEnum"
-    map :map_string_int32, :string, :int32, 69
-    map :map_string_bool, :string, :bool, 70
-    optional :nested_message, :message, 80, "a.b.c.TestMessage.NestedMessage"
-    oneof :my_oneof do
-      optional :oneof_int32, :int32, 41
-      optional :oneof_int64, :int64, 42
-      optional :oneof_uint32, :uint32, 43
-      optional :oneof_uint64, :uint64, 44
-      optional :oneof_bool, :bool, 45
-      optional :oneof_double, :double, 46
-      optional :oneof_float, :float, 47
-      optional :oneof_string, :string, 48
-      optional :oneof_bytes, :bytes, 49
-      optional :oneof_enum, :enum, 50, "a.b.c.TestEnum"
-      optional :oneof_msg, :message, 51, "a.b.c.TestMessage"
-    end
-  end
-  add_message "a.b.c.TestMessage.NestedMessage" do
-    optional :foo, :int32, 1
-  end
-  add_enum "a.b.c.TestEnum" do
-    value :Default, 0
-    value :A, 1
-    value :B, 2
-    value :C, 3
-  end
-end
-
-module A
-  module B
-    module C
-      TestMessage = Google::Protobuf::DescriptorPool.generated_pool.lookup("a.b.c.TestMessage").msgclass
-      TestMessage::NestedMessage = Google::Protobuf::DescriptorPool.generated_pool.lookup("a.b.c.TestMessage.NestedMessage").msgclass
-      TestEnum = Google::Protobuf::DescriptorPool.generated_pool.lookup("a.b.c.TestEnum").enummodule
-    end
-  end
-end
diff --git a/ruby/tests/test_import_pb.rb b/ruby/tests/test_import_pb.rb
deleted file mode 100644
index 83f04d6053..0000000000
--- a/ruby/tests/test_import_pb.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: tests/test_import.proto
-
-require 'google/protobuf'
-
-Google::Protobuf::DescriptorPool.generated_pool.build do
-  add_message "foo_bar.TestImportedMessage" do
-  end
-end
-
-module FooBar
-  TestImportedMessage = Google::Protobuf::DescriptorPool.generated_pool.lookup("foo_bar.TestImportedMessage").msgclass
-end