diff --git a/SabreTools.RedumpLib.Test/Data/ExtensionsTests.cs b/SabreTools.RedumpLib.Test/Data/ExtensionsTests.cs
index 01f816d..8d733fb 100644
--- a/SabreTools.RedumpLib.Test/Data/ExtensionsTests.cs
+++ b/SabreTools.RedumpLib.Test/Data/ExtensionsTests.cs
@@ -381,7 +381,6 @@ namespace SabreTools.RedumpLib.Test.Data
             MediaType.BD66,
             MediaType.BD100,
             MediaType.BD128,
-            MediaType.MaxTest4Layer,
             MediaType.CD,
             MediaType.DVD5,
             MediaType.DVD9,
diff --git a/SabreTools.RedumpLib/Data/Constants.cs b/SabreTools.RedumpLib/Data/Constants.cs
index b7d88ed..1799770 100644
--- a/SabreTools.RedumpLib/Data/Constants.cs
+++ b/SabreTools.RedumpLib/Data/Constants.cs
@@ -100,10 +100,9 @@ namespace SabreTools.RedumpLib.Data
         public static readonly Regex ModifiedRegex = new(@"<tr><td><strong>Modified</strong></td><td>(.*?)</td></tr>", RegexOptions.Compiled);
 
         /// <summary>
-        /// Regex matching individual WIP disc links on a results page
+        /// Regex matching individual queue disc links on a results page
         /// </summary>
-        /// TODO: Determine if this has a parallel in redump.info, maybe the queue page?
-        public static readonly Regex NewDiscRegex = new(@"<a (style=.*)?href=""/newdisc/(\d+)/"">", RegexOptions.Compiled);
+        public static readonly Regex QueueDiscRegex = new(@"<a href=""/queue/(.*?)"">", RegexOptions.Compiled);
 
         /// <summary>
         /// Regex matching the region field on a disc page
diff --git a/SabreTools.RedumpLib/Data/Enumerations.cs b/SabreTools.RedumpLib/Data/Enumerations.cs
index bafe514..5f7682c 100644
--- a/SabreTools.RedumpLib/Data/Enumerations.cs
+++ b/SabreTools.RedumpLib/Data/Enumerations.cs
@@ -1755,10 +1755,6 @@ namespace SabreTools.RedumpLib.Data
         [HumanReadable(LongName = "HD-DVD (DL)", ShortName = "hdvd30")]
         HDDVDDL,
 
-        // TODO: Figure out how to mark this as debug-only
-        [HumanReadable(LongName = "Max Test (4-layer)", ShortName = "test4l")]
-        MaxTest4Layer,
-
         /// <remarks>Not official</remarks>
         [HumanReadable(LongName = "MIL-CD", ShortName = "milcd")]
         MILCD,
diff --git a/SabreTools.RedumpLib/Data/Extensions.cs b/SabreTools.RedumpLib/Data/Extensions.cs
index a940d0d..65ec9ca 100644
--- a/SabreTools.RedumpLib/Data/Extensions.cs
+++ b/SabreTools.RedumpLib/Data/Extensions.cs
@@ -1044,8 +1044,7 @@ namespace SabreTools.RedumpLib.Data
                     or MediaType.BD50
                     or MediaType.BD66
                     or MediaType.BD100
-                    or MediaType.BD128
-                    or MediaType.MaxTest4Layer => PhysicalMediaType.BluRay,
+                    or MediaType.BD128 => PhysicalMediaType.BluRay,
                 MediaType.CD => PhysicalMediaType.CDROM,
                 MediaType.DVD5
                     or MediaType.DVD9 => PhysicalMediaType.DVD,
diff --git a/SabreTools.RedumpLib/Web/Client.cs b/SabreTools.RedumpLib/Web/Client.cs
index ba95f6f..a58b0e6 100644
--- a/SabreTools.RedumpLib/Web/Client.cs
+++ b/SabreTools.RedumpLib/Web/Client.cs
@@ -182,8 +182,6 @@ namespace SabreTools.RedumpLib.Web
                     string formToken = Constants.FormTokenRegex.Match(loginPage ?? string.Empty).Groups[1].Value;
                     string sessionId = Constants.SessionIDRegex.Match(loginPage ?? string.Empty).Groups[1].Value;
 
-                    // TODO: Determine which of the redirect items is needed, if either
-
 #if NETCOREAPP
                     // Construct the login request
 #if NET5_0
@@ -834,8 +832,8 @@ namespace SabreTools.RedumpLib.Web
                 return ids;
             }
 
-            // Otherwise, traverse each dump on the page
-            var matches = Constants.NewDiscRegex.Matches(dumpsPage);
+            // Otherwise, traverse each item in the queue on the page
+            var matches = Constants.QueueDiscRegex.Matches(dumpsPage);
             foreach (Match? match in matches)
             {
                 if (match is null)