diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/MemberCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/MemberCodegen.java
index d592fe6e4ab..92b8c97e76c 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/MemberCodegen.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/MemberCodegen.java
@@ -479,14 +479,6 @@ public abstract class MemberCodegen<T extends KtElement/* TODO: & JetDeclaration
         return false;
     }
 
-    public static void generateModuleNameField(
-            @NotNull GenerationState state,
-            @NotNull ClassBuilder classBuilder
-    ) {
-        classBuilder.newField(NO_ORIGIN, ACC_PUBLIC | ACC_STATIC | ACC_FINAL | ACC_SYNTHETIC, JvmAbi.MODULE_NAME_FIELD,
-                              AsmTypes.JAVA_STRING_TYPE.getDescriptor(), null, state.getModuleName());
-    }
-
     protected void generatePropertyMetadataArrayFieldIfNeeded(@NotNull Type thisAsmType) {
         List<KtProperty> delegatedProperties = new ArrayList<KtProperty>();
         for (KtDeclaration declaration : ((KtDeclarationContainer) element).getDeclarations()) {
diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/MultifileClassCodegen.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/MultifileClassCodegen.kt
index 128eb1961f0..4c6d18deaa8 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/MultifileClassCodegen.kt
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/MultifileClassCodegen.kt
@@ -29,7 +29,6 @@ import org.jetbrains.kotlin.descriptors.PackageFragmentDescriptor
 import org.jetbrains.kotlin.descriptors.Visibilities
 import org.jetbrains.kotlin.diagnostics.DiagnosticUtils
 import org.jetbrains.kotlin.fileClasses.JvmFileClassUtil
-import org.jetbrains.kotlin.fileClasses.getFileClassType
 import org.jetbrains.kotlin.load.java.JvmAnnotationNames
 import org.jetbrains.kotlin.load.kotlin.PackageParts
 import org.jetbrains.kotlin.load.kotlin.incremental.IncrementalPackageFragmentProvider
@@ -138,9 +137,7 @@ public class MultifileClassCodegen(
             tasks: Map<CallableMemberDescriptor, () -> Unit>,
             partFqNames: List<FqName>
     ) {
-        MemberCodegen.generateModuleNameField(state, classBuilder)
-
-        for (member in tasks.keySet().sortedWith(MemberComparator.INSTANCE)) {
+        for (member in tasks.keys.sortedWith(MemberComparator.INSTANCE)) {
             tasks[member]!!()
         }
 
diff --git a/compiler/serialization/src/org/jetbrains/kotlin/serialization/DescriptorSerializer.java b/compiler/serialization/src/org/jetbrains/kotlin/serialization/DescriptorSerializer.java
index 81bf9a6f50f..1984f3f047f 100644
--- a/compiler/serialization/src/org/jetbrains/kotlin/serialization/DescriptorSerializer.java
+++ b/compiler/serialization/src/org/jetbrains/kotlin/serialization/DescriptorSerializer.java
@@ -526,16 +526,10 @@ public class DescriptorSerializer {
     }
 
     @NotNull
-    public ProtoBuf.Package.Builder packageProtoWithoutDescriptors() {
-        ProtoBuf.Package.Builder builder = ProtoBuf.Package.newBuilder();
-
-        extension.serializePackage(Collections.<PackageFragmentDescriptor>emptyList(), builder);
-
-        return builder;
-    }
-
-    @NotNull
-    public ProtoBuf.Package.Builder packageProto(@NotNull Collection<PackageFragmentDescriptor> fragments, @Nullable Function1<DeclarationDescriptor, Boolean> skip) {
+    public ProtoBuf.Package.Builder packageProto(
+            @NotNull Collection<PackageFragmentDescriptor> fragments,
+            @Nullable Function1<DeclarationDescriptor, Boolean> skip
+    ) {
         ProtoBuf.Package.Builder builder = ProtoBuf.Package.newBuilder();
 
         Collection<DeclarationDescriptor> members = new ArrayList<DeclarationDescriptor>();
diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/JvmAbi.java b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/JvmAbi.java
index df4248763c3..ff6c01ee5f5 100644
--- a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/JvmAbi.java
+++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/JvmAbi.java
@@ -53,7 +53,6 @@ public final class JvmAbi {
     public static final String INSTANCE_FIELD = "INSTANCE";
     public static final String DEPRECATED_INSTANCE_FIELD = "INSTANCE$";
 
-    public static final String MODULE_NAME_FIELD = "$moduleName";
     public static final String DEFAULT_MODULE_NAME = "main";
     public static final ClassId REFLECTION_FACTORY_IMPL = ClassId.topLevel(new FqName("kotlin.reflect.jvm.internal.ReflectionFactoryImpl"));