diff --git a/CDChecksums.cs b/CDChecksums.cs
index bdf250c..7e12490 100644
--- a/CDChecksums.cs
+++ b/CDChecksums.cs
@@ -304,10 +304,9 @@ public static class CdChecksums
 
                 uint calculatedEdc = ComputeEdc(0, mode2Sector, 0x91C);
 
-                correctEdc = calculatedEdc == storedEdc || storedEdc == 0;
+                correctEdc = calculatedEdc == storedEdc;
 
-                if(calculatedEdc == storedEdc ||
-                   storedEdc     == 0x00000000)
+                if(calculatedEdc == storedEdc)
                     return true;
 
                 AaruConsole.DebugWriteLine("CD checksums",
diff --git a/CRC32/clmul.cs b/CRC32/clmul.cs
index 8228d76..540ff00 100644
--- a/CRC32/clmul.cs
+++ b/CRC32/clmul.cs
@@ -62,25 +62,6 @@ static class Clmul
         0x63cd6124, 0x00000001, /* rk6 */ 0xf7011640, 0x00000001, /* rk7 */ 0xdb710640, 0x00000001  /* rk8 */
     };
 
-    static readonly Vector128<uint>[] _pshufbShfTable =
-    {
-        Vector128.Create(0x84838281, 0x88878685, 0x8c8b8a89, 0x008f8e8d),  /* shl 15 (16 - 1)/shr1 */
-        Vector128.Create(0x85848382, 0x89888786, 0x8d8c8b8a, 0x01008f8e),  /* shl 14 (16 - 3)/shr2 */
-        Vector128.Create(0x86858483, 0x8a898887, 0x8e8d8c8b, 0x0201008f),  /* shl 13 (16 - 4)/shr3 */
-        Vector128.Create(0x87868584, 0x8b8a8988, 0x8f8e8d8c, 0x03020100),  /* shl 12 (16 - 4)/shr4 */
-        Vector128.Create(0x88878685, 0x8c8b8a89, 0x008f8e8d, 0x04030201),  /* shl 11 (16 - 5)/shr5 */
-        Vector128.Create(0x89888786, 0x8d8c8b8a, 0x01008f8e, 0x05040302),  /* shl 10 (16 - 6)/shr6 */
-        Vector128.Create(0x8a898887, 0x8e8d8c8b, 0x0201008f, 0x06050403),  /* shl  9 (16 - 7)/shr7 */
-        Vector128.Create(0x8b8a8988, 0x8f8e8d8c, 0x03020100, 0x07060504),  /* shl  8 (16 - 8)/shr8 */
-        Vector128.Create(0x8c8b8a89, 0x008f8e8d, 0x04030201, 0x08070605),  /* shl  7 (16 - 9)/shr9 */
-        Vector128.Create(0x8d8c8b8a, 0x01008f8e, 0x05040302, 0x09080706),  /* shl  6 (16 -10)/shr10*/
-        Vector128.Create(0x8e8d8c8b, 0x0201008f, 0x06050403, 0x0a090807),  /* shl  5 (16 -11)/shr11*/
-        Vector128.Create(0x8f8e8d8c, 0x03020100, 0x07060504, 0x0b0a0908),  /* shl  4 (16 -12)/shr12*/
-        Vector128.Create(0x008f8e8du, 0x04030201, 0x08070605, 0x0c0b0a09), /* shl  3 (16 -13)/shr13*/
-        Vector128.Create(0x01008f8eu, 0x05040302, 0x09080706, 0x0d0c0b0a), /* shl  2 (16 -14)/shr14*/
-        Vector128.Create(0x0201008fu, 0x06050403, 0x0a090807, 0x0e0d0c0b)  /* shl  1 (16 -15)/shr15*/
-    };
-
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
     static void Fold4(ref Vector128<uint> xmmCRC0, ref Vector128<uint> xmmCRC1, ref Vector128<uint> xmmCRC2,
                       ref Vector128<uint> xmmCRC3)