From 2f52c3fff87debed32a8464a5994c507c261d4a7 Mon Sep 17 00:00:00 2001
From: Rolf Bjarne Kvinge <rolf@xamarin.com>
Date: Thu, 27 Feb 2020 22:15:00 +0100
Subject: [PATCH] [src] Remove dead classic/unified code. (#7999)

---
 src/ObjCRuntime/Stret.cs           |  7 -------
 src/generator-attribute-manager.cs | 12 ++----------
 2 files changed, 2 insertions(+), 17 deletions(-)

diff --git a/src/ObjCRuntime/Stret.cs b/src/ObjCRuntime/Stret.cs
index 51a45d6d86..4a187276b7 100644
--- a/src/ObjCRuntime/Stret.cs
+++ b/src/ObjCRuntime/Stret.cs
@@ -37,13 +37,6 @@ namespace ObjCRuntime
 {
 	class Stret
 	{
-#if BGENERATOR
-#elif __UNIFIED__
-		const bool isUnified = true;
-#else
-		const bool isUnified = false;
-#endif
-
 		static bool IsHomogeneousAggregateSmallEnough_Armv7k (Type t, int members)
 		{
 			// https://github.com/llvm-mirror/clang/blob/82f6d5c9ae84c04d6e7b402f72c33638d1fb6bc8/lib/CodeGen/TargetInfo.cpp#L5516-L5519
diff --git a/src/generator-attribute-manager.cs b/src/generator-attribute-manager.cs
index 1fcf23f68c..874a241a4e 100644
--- a/src/generator-attribute-manager.cs
+++ b/src/generator-attribute-manager.cs
@@ -63,16 +63,8 @@ public class AttributeManager
 			// Types (attributes) in the generator are mocked types from
 			// either the binding assembly or the platform assembly.
 			rv = TypeManager.BindingAssembly.GetType (type.FullName);
-			if (rv == null) {
-				string fullname;
-				// HACK ??
-				if (type.Namespace?.StartsWith ("XamCore.", System.StringComparison.Ordinal) == true) {
-					fullname = type.FullName.Substring (8);
-				} else {
-					fullname = type.FullName;
-				}
-				rv = TypeManager.PlatformAssembly.GetType (fullname);
-			}
+			if (rv == null)
+				rv = TypeManager.PlatformAssembly.GetType (type.FullName);
 		} else {
 			throw ErrorHelper.CreateError (1054, type.AssemblyQualifiedName);
 		}