diff --git a/Weaver/Xtensive.Orm.Weaver/ReferenceRegistry.cs b/Weaver/Xtensive.Orm.Weaver/ReferenceRegistry.cs
index a6d48a20b6..a3beadf214 100644
--- a/Weaver/Xtensive.Orm.Weaver/ReferenceRegistry.cs
+++ b/Weaver/Xtensive.Orm.Weaver/ReferenceRegistry.cs
@@ -17,8 +17,6 @@ public sealed class ReferenceRegistry
     public TypeReference Type { get; set; }
     public TypeReference Exception { get; set; }
     public TypeReference RuntimeTypeHandle { get; set; }
-    public TypeReference StreamingContext { get; set; }
-    public TypeReference SerializationInfo { get; set; }
 
     public MethodReference TypeGetTypeFromHandle { get; set; }
     public MethodReference CompilerGeneratedAttributeConstructor { get; set; }
diff --git a/Weaver/Xtensive.Orm.Weaver/Stages/ImportReferencesStage.cs b/Weaver/Xtensive.Orm.Weaver/Stages/ImportReferencesStage.cs
index c2f7b1b611..0ccfb65dc2 100644
--- a/Weaver/Xtensive.Orm.Weaver/Stages/ImportReferencesStage.cs
+++ b/Weaver/Xtensive.Orm.Weaver/Stages/ImportReferencesStage.cs
@@ -32,8 +32,6 @@ public override ActionResult Execute(ProcessorContext context)
       var typeType = registry.Type = ImportType(context, mscorlibAssembly, "System.Type");
       var exceptionType = registry.Exception = ImportType(context, mscorlibAssembly, "System.Exception");
       var runtimeTypeHandleType = registry.RuntimeTypeHandle = ImportType(context, mscorlibAssembly, "System.RuntimeTypeHandle", true);
-      registry.SerializationInfo = ImportType(context, mscorlibAssembly, "System.Runtime.Serialization.SerializationInfo");
-      registry.StreamingContext = ImportType(context, mscorlibAssembly, "System.Runtime.Serialization.StreamingContext", true);
       registry.TypeGetTypeFromHandle = ImportMethod(context, typeType, "GetTypeFromHandle", false, typeType, runtimeTypeHandleType);
       registry.CompilerGeneratedAttributeConstructor = ImportConstructor(context, mscorlibAssembly, WellKnown.CompilerGeneratedAttribute);
 
diff --git a/Weaver/Xtensive.Orm.Weaver/Stages/ModifyPersistentTypesStage.cs b/Weaver/Xtensive.Orm.Weaver/Stages/ModifyPersistentTypesStage.cs
index 5f8e0c016b..91a24b793f 100644
--- a/Weaver/Xtensive.Orm.Weaver/Stages/ModifyPersistentTypesStage.cs
+++ b/Weaver/Xtensive.Orm.Weaver/Stages/ModifyPersistentTypesStage.cs
@@ -22,41 +22,39 @@ public override ActionResult Execute(ProcessorContext context)
     {
       var references = context.References;
 
-      entityFactorySignatures = new[] {
-        new[] {references.SerializationInfo, references.StreamingContext},
-        new[] {references.Session, references.EntityState},
-      };
-
-      structureFactorySignatures = new[] {
-        new[] {references.SerializationInfo, references.StreamingContext},
-        new[] {references.Session, references.Tuple},
-        new[] {references.Persistent, references.FieldInfo},
-      };
-
-      entitySetFactorySignatures = new[] {
-        new[] {references.SerializationInfo, references.StreamingContext},
-        new[] {references.Entity, references.FieldInfo},
-      };
+      entityFactorySignatures = [
+        [references.Session, references.EntityState],
+      ];
+
+      structureFactorySignatures = [
+        [references.Session, references.Tuple],
+        [references.Persistent, references.FieldInfo],
+      ];
+
+      entitySetFactorySignatures = [
+        [references.Entity, references.FieldInfo],
+      ];
 
       propertyChecker = (context.Language==SourceLanguage.CSharp) 
         ? (IPersistentPropertyChecker) new CsPropertyChecker() 
         : new VbPropertyChecker();
 
-      foreach (var type in context.PersistentTypes)
+      foreach (var type in context.PersistentTypes) {
         switch (type.Kind) {
-        case PersistentTypeKind.Entity:
-          ProcessEntity(context, type);
-          break;
-        case PersistentTypeKind.EntitySet:
-          ProcessEntitySet(context, type);
-          break;
-        case PersistentTypeKind.EntityInterface:
-          ProcessEntityInterface(context, type);
-          break;
-        case PersistentTypeKind.Structure:
-          ProcessStructure(context, type);
-          break;
+          case PersistentTypeKind.Entity:
+            ProcessEntity(context, type);
+            break;
+          case PersistentTypeKind.EntitySet:
+            ProcessEntitySet(context, type);
+            break;
+          case PersistentTypeKind.EntityInterface:
+            ProcessEntityInterface(context, type);
+            break;
+          case PersistentTypeKind.Structure:
+            ProcessStructure(context, type);
+            break;
         }
+      }
 
       if (propertyChecker.HasSkippedProperties) {
         context.Logger.Write(MessageCode.ErrorPersistentPropertiesWereNotProcessed);