diff --git a/src/Xamarin.Android.Tools.AndroidSdk/AndroidVersions.cs b/src/Xamarin.Android.Tools.AndroidSdk/AndroidVersions.cs
index 59ac73f..b258127 100644
--- a/src/Xamarin.Android.Tools.AndroidSdk/AndroidVersions.cs
+++ b/src/Xamarin.Android.Tools.AndroidSdk/AndroidVersions.cs
@@ -184,26 +184,4 @@ static bool MatchesId (AndroidVersion version, string id)
 			},
 		};
 	}
-
-	class EqualityComparer<T> : IEqualityComparer<T>
-	{
-		Func<T, T, bool>    equals;
-		Func<T, int>        getHashCode;
-
-		public EqualityComparer (Func<T, T, bool> equals, Func<T, int>? getHashCode = null)
-		{
-			this.equals         = equals;
-			this.getHashCode    = getHashCode ?? (v => v?.GetHashCode () ?? 0);
-		}
-
-		public bool Equals (T x, T y)
-		{
-			return equals (x, y);
-		}
-
-		public int GetHashCode (T obj)
-		{
-			return getHashCode (obj);
-		}
-	}
 }
diff --git a/src/Xamarin.Android.Tools.AndroidSdk/JdkInfo.cs b/src/Xamarin.Android.Tools.AndroidSdk/JdkInfo.cs
index 8ff1c4a..9a72a79 100644
--- a/src/Xamarin.Android.Tools.AndroidSdk/JdkInfo.cs
+++ b/src/Xamarin.Android.Tools.AndroidSdk/JdkInfo.cs
@@ -492,9 +492,9 @@ class JdkInfoVersionComparer : IComparer<JdkInfo>
 	{
 		public  static  readonly    IComparer<JdkInfo> Default = new JdkInfoVersionComparer ();
 
-		public int Compare (JdkInfo x, JdkInfo y)
+		public int Compare ([AllowNull]JdkInfo x, [AllowNull]JdkInfo y)
 		{
-			if (x.Version != null && y.Version != null)
+			if (x?.Version != null && y?.Version != null)
 				return x.Version.CompareTo (y.Version);
 			return 0;
 		}