diff --git a/protobuf/compiler/src/google/protobuf/compiler/j2objc/j2objc_file.cc b/protobuf/compiler/src/google/protobuf/compiler/j2objc/j2objc_file.cc
index 009095c5c1..ccf0808ad6 100644
--- a/protobuf/compiler/src/google/protobuf/compiler/j2objc/j2objc_file.cc
+++ b/protobuf/compiler/src/google/protobuf/compiler/j2objc/j2objc_file.cc
@@ -261,155 +261,10 @@ void FileGenerator::GenerateHeader(GeneratorContext* context) {
 }
 
 void FileGenerator::GenerateSource(GeneratorContext* context) {
-  std::string filename = GetFileName(".m");
+  std::string filename = GetFileName(".mm");
 
   std::unique_ptr<io::ZeroCopyOutputStream> output(context->Open(filename));
   io::Printer printer(output.get(), '$');
-
-  GenerateSourceBoilerplate(&printer);
-
-  std::set<std::string> headers;
-  AddSourceImports(headers);
-  headers.insert(GetFileName(".h"));
-  if (!enforce_lite_) {
-    headers.insert("com/google/protobuf/ExtensionRegistry.h");
-  }
-  headers.insert("com/google/protobuf/ExtensionRegistryLite.h");
-  if (GenerateMultipleFiles()) {
-    for (int i = 0; i < file_->message_type_count(); i++) {
-      headers.insert(GetHeader(file_->message_type(i)));
-    }
-  } else {
-    for (int i = 0; i < file_->message_type_count(); i++) {
-      if (enforce_lite_) {
-        MessageLiteGenerator(file_->message_type(i))
-            .CollectSourceImports(&headers);
-      } else {
-        MessageGenerator(file_->message_type(i)).CollectSourceImports(&headers);
-      }
-    }
-    for (int i = 0; i < file_->enum_type_count(); i++) {
-      EnumGenerator(file_->enum_type(i)).CollectSourceImports(&headers);
-    }
-  }
-  for (int i = 0; i < file_->extension_count(); i++) {
-    ExtensionGenerator(file_->extension(i)).CollectSourceImports(&headers);
-  }
-  PrintImports(&headers, &printer);
-  PrintSourcePreamble(&printer);
-
-  if (file_->extension_count() > 0) {
-    printer.Print("\nJ2OBJC_INITIALIZED_DEFN($classname$)\n", "classname",
-                  ClassName(file_));
-  }
-  for (int i = 0; i < file_->extension_count(); i++) {
-    ExtensionGenerator(file_->extension(i)).GenerateSourceDefinition(&printer);
-  }
-
-  printer.Print(
-      "\n"
-      "@implementation $classname$\n"
-      "\n",
-      "classname", ClassName(file_));
-
-  if (!enforce_lite_) {
-    printer.Print(
-        "+ (void)registerAllExtensionsWithComGoogleProtobufExtensionRegistry:"
-        "(ComGoogleProtobufExtensionRegistry *)extensionRegistry {\n"
-        "  $classname$_registerAllExtensionsWithComGoogleProtobuf"
-        "ExtensionRegistry_(extensionRegistry);\n"
-        "}\n"
-        "\n",
-        "classname", ClassName(file_));
-  }
-
-  printer.Print(
-      "+ (void)registerAllExtensionsWithComGoogleProtobufExtensionRegistryLite:"
-      "(ComGoogleProtobufExtensionRegistryLite *)extensionRegistry {\n"
-      "  $classname$_registerAllExtensionsWithComGoogleProtobuf"
-      "ExtensionRegistryLite_(extensionRegistry);\n"
-      "}\n",
-      "classname", ClassName(file_));
-
-  if (file_->extension_count() > 0) {
-    printer.Print(
-        "\n"
-        "+ (void)initialize {\n"
-        "  if (self == [$classname$ class]) {\n"
-        "    static CGPFieldData extensionFields[] = {\n",
-        "classname", ClassName(file_));
-    printer.Indent();
-    printer.Indent();
-    printer.Indent();
-    for (int i = 0; i < file_->extension_count(); i++) {
-      ExtensionGenerator(file_->extension(i)).GenerateFieldData(&printer);
-    }
-    printer.Outdent();
-    printer.Print("};\n");
-    for (int i = 0; i < file_->extension_count(); i++) {
-      ExtensionGenerator(file_->extension(i))
-          .GenerateSourceInitializer(&printer);
-    }
-    printer.Print("J2OBJC_SET_INITIALIZED($classname$)\n", "classname",
-                  ClassName(file_));
-    printer.Outdent();
-    printer.Outdent();
-    printer.Print("  }\n}\n");
-  }
-
-  printer.Print(
-      "\n"
-      "@end\n"
-      "\n"
-      "J2OBJC_CLASS_TYPE_LITERAL_SOURCE($classname$)\n"
-      "\n",
-      "classname", ClassName(file_));
-
-  if (!enforce_lite_) {
-    printer.Print(
-        "void $classname$_registerAllExtensionsWith"
-        "ComGoogleProtobufExtensionRegistry_("
-        "ComGoogleProtobufExtensionRegistry *extensionRegistry) {\n"
-        "  $classname$_registerAllExtensionsWith"
-        "ComGoogleProtobufExtensionRegistryLite_(extensionRegistry);\n"
-        "}\n"
-        "\n",
-        "classname", ClassName(file_));
-  }
-
-  printer.Print(
-      "void $classname$_registerAllExtensionsWith"
-      "ComGoogleProtobufExtensionRegistryLite_("
-      "ComGoogleProtobufExtensionRegistryLite *extensionRegistry) {\n",
-      "classname", ClassName(file_));
-  printer.Indent();
-  for (int i = 0; i < file_->extension_count(); i++) {
-    ExtensionGenerator(file_->extension(i)).GenerateRegistrationCode(&printer);
-  }
-  for (int i = 0; i < file_->message_type_count(); i++) {
-    if (enforce_lite_) {
-      MessageLiteGenerator(file_->message_type(i))
-          .GenerateExtensionRegistrationCode(&printer);
-    } else {
-      MessageGenerator(file_->message_type(i))
-          .GenerateExtensionRegistrationCode(&printer);
-    }
-  }
-  printer.Outdent();
-  printer.Print("}\n");
-
-  if (!GenerateMultipleFiles()) {
-    for (int i = 0; i < file_->enum_type_count(); i++) {
-      EnumGenerator(file_->enum_type(i)).GenerateSource(&printer);
-    }
-    for (int i = 0; i < file_->message_type_count(); i++) {
-      if (enforce_lite_) {
-        MessageLiteGenerator(file_->message_type(i)).GenerateSource(&printer);
-      } else {
-        MessageGenerator(file_->message_type(i)).GenerateSource(&printer);
-      }
-    }
-  }
 }
 
 std::string FileGenerator::GetFileName(std::string suffix) {
@@ -421,7 +276,7 @@ std::string FileGenerator::GetFileName(std::string suffix) {
 }
 
 void FileGenerator::Generate(GeneratorContext* context) {
-  GenerateHeader(context);
+  // GenerateHeader(context);
   GenerateSource(context);
 }
 
diff --git a/protobuf/compiler/src/google/protobuf/compiler/j2objc/j2objc_generator.cc b/protobuf/compiler/src/google/protobuf/compiler/j2objc/j2objc_generator.cc
index c3de31ca25..06e99edbe4 100644
--- a/protobuf/compiler/src/google/protobuf/compiler/j2objc/j2objc_generator.cc
+++ b/protobuf/compiler/src/google/protobuf/compiler/j2objc/j2objc_generator.cc
@@ -58,15 +58,17 @@ bool J2ObjCGenerator::Generate(const FileDescriptor* file,
   bool enforce_lite = false;
 
   for (int i = 0; i < options.size(); i++) {
-    if (options[i].first == "prefixes") {
-      ParsePrefixFile(options[i].second);
-    } else if (options[i].first == "global_prefix") {
-      SetGlobalPrefix(options[i].second);
-    } else if (options[i].first == "global_postfix") {
-      SetGlobalPostfix(options[i].second);
-    } else if (options[i].first == "file_sub_extension") {
-      SetFileSubExtension(options[i].second);
-    } else if (options[i].first == "file_dir_mapping") {
+    // if (options[i].first == "prefixes") {
+    //   ParsePrefixFile(options[i].second);
+    // } else if (options[i].first == "global_prefix") {
+    //   SetGlobalPrefix(options[i].second);
+    // } else if (options[i].first == "global_postfix") {
+    //   SetGlobalPostfix(options[i].second);
+    // }
+    // else if (options[i].first == "file_sub_extension") {
+    //   SetFileSubExtension(options[i].second);
+    // } else
+    if (options[i].first == "file_dir_mapping") {
       GenerateFileDirMapping();
     } else if (options[i].first == "generate_class_mappings") {
       generate_class_mappings = true;
@@ -90,8 +92,8 @@ bool J2ObjCGenerator::Generate(const FileDescriptor* file,
   // Generate main source and header files.
   file_generator.Generate(context);
 
-  // Generate sibling files.
-  file_generator.GenerateSiblings(context);
+  // // Generate sibling files.
+  // file_generator.GenerateSiblings(context);
 
   if (IsGenerateFileDirMapping()) {
     file_generator.GenerateHeaderMappings(context);
@@ -101,10 +103,11 @@ bool J2ObjCGenerator::Generate(const FileDescriptor* file,
     file_generator.GenerateClassMappings(context);
   }
 
-  if (enforce_lite) {
-    // If true, we should build .meta files and emit @Generated annotations into
-    // generated code.
-  }
+  // if (enforce_lite) {
+  //   // If true, we should build .meta files and emit @Generated annotations
+  //   into
+  //   // generated code.
+  // }
 
   return true;
 }
diff --git a/translator/src/main/java/com/google/devtools/j2objc/gen/JavadocGenerator.java b/translator/src/main/java/com/google/devtools/j2objc/gen/JavadocGenerator.java
index b1f9cf97a9..0d95ee102b 100644
--- a/translator/src/main/java/com/google/devtools/j2objc/gen/JavadocGenerator.java
+++ b/translator/src/main/java/com/google/devtools/j2objc/gen/JavadocGenerator.java
@@ -266,9 +266,9 @@ private String escapeCodeText(String text) {
       if (preStart > 0) {
         sb.append('\n');
       }
-      sb.append("@code\n");
+      // sb.append("@code\n");
       sb.append(text.substring(preStart + "<pre>".length(), preEnd));
-      sb.append("\n@endcode");
+      // sb.append("\n@endcode");
       sb.append(text.substring(preEnd + "</pre>".length()));
     } else if (preStart > -1) {
       // The text has <pre> but not the </pre> should be in a following Javadoc tag.
@@ -276,12 +276,12 @@ private String escapeCodeText(String text) {
       if (preStart > 0) {
         sb.append('\n');
       }
-      sb.append("@code\n");
+      // sb.append("@code\n");
       sb.append(text.substring(preStart + "<pre>".length()));
       spanningPreTag = true;
     } else {
       // The text just has a </pre>.
-      sb.append("\n@endcode");
+      // sb.append("\n@endcode");
       sb.append(text.substring(preEnd + "</pre>".length()));
       spanningPreTag = false;
     }