diff --git a/src/SharpCompress/Common/EntryStream.Async.cs b/src/SharpCompress/Common/EntryStream.Async.cs
index 21708a89..a58afe70 100644
--- a/src/SharpCompress/Common/EntryStream.Async.cs
+++ b/src/SharpCompress/Common/EntryStream.Async.cs
@@ -42,9 +42,6 @@ public partial class EntryStream
                 await lzmaStream.FlushAsync().ConfigureAwait(false);
             }
         }
-#if DEBUG_STREAMS
-        this.DebugDispose(typeof(EntryStream));
-#endif
         await base.DisposeAsync().ConfigureAwait(false);
         await _stream.DisposeAsync().ConfigureAwait(false);
     }
diff --git a/src/SharpCompress/Common/Rar/Headers/FileHeader.Async.cs b/src/SharpCompress/Common/Rar/Headers/FileHeader.Async.cs
index f753eb03..a43ad55b 100644
--- a/src/SharpCompress/Common/Rar/Headers/FileHeader.Async.cs
+++ b/src/SharpCompress/Common/Rar/Headers/FileHeader.Async.cs
@@ -6,13 +6,7 @@ using System.Threading;
 using System.Threading.Tasks;
 using SharpCompress.Common.Rar;
 using SharpCompress.IO;
-#if !Rar2017_64bit
 using size_t = System.UInt32;
-#else
-using nint = System.Int64;
-using nuint = System.UInt64;
-using size_t = System.UInt64;
-#endif
 
 namespace SharpCompress.Common.Rar.Headers;
 
diff --git a/src/SharpCompress/Common/Rar/Headers/FileHeader.cs b/src/SharpCompress/Common/Rar/Headers/FileHeader.cs
index f0b7a53c..966dc2bc 100644
--- a/src/SharpCompress/Common/Rar/Headers/FileHeader.cs
+++ b/src/SharpCompress/Common/Rar/Headers/FileHeader.cs
@@ -6,13 +6,7 @@ using System.Threading;
 using System.Threading.Tasks;
 using SharpCompress.Common.Rar;
 using SharpCompress.IO;
-#if !Rar2017_64bit
 using size_t = System.UInt32;
-#else
-using nint = System.Int64;
-using nuint = System.UInt64;
-using size_t = System.UInt64;
-#endif
 
 namespace SharpCompress.Common.Rar.Headers;
 
diff --git a/src/SharpCompress/Compressors/Rar/UnpackV2017/BitInput.getbits_cpp.cs b/src/SharpCompress/Compressors/Rar/UnpackV2017/BitInput.getbits_cpp.cs
index 17368531..e0e5b3e0 100644
--- a/src/SharpCompress/Compressors/Rar/UnpackV2017/BitInput.getbits_cpp.cs
+++ b/src/SharpCompress/Compressors/Rar/UnpackV2017/BitInput.getbits_cpp.cs
@@ -1,10 +1,5 @@
-#if !Rar2017_64bit
+
 using size_t = System.UInt32;
-#else
-using nint = System.Int64;
-using nuint = System.UInt64;
-using size_t = System.UInt64;
-#endif
 
 #nullable disable
 
diff --git a/src/SharpCompress/Compressors/Rar/UnpackV2017/FragmentedWindow.unpack50frag_cpp.cs b/src/SharpCompress/Compressors/Rar/UnpackV2017/FragmentedWindow.unpack50frag_cpp.cs
index a9a6f280..97d513c3 100644
--- a/src/SharpCompress/Compressors/Rar/UnpackV2017/FragmentedWindow.unpack50frag_cpp.cs
+++ b/src/SharpCompress/Compressors/Rar/UnpackV2017/FragmentedWindow.unpack50frag_cpp.cs
@@ -1,13 +1,7 @@
 #nullable disable
 
 using System;
-#if !Rar2017_64bit
 using size_t = System.UInt32;
-#else
-using nint = System.Int64;
-using nuint = System.UInt64;
-using size_t = System.UInt64;
-#endif
 
 namespace SharpCompress.Compressors.Rar.UnpackV2017;
 
diff --git a/src/SharpCompress/Compressors/Rar/UnpackV2017/Unpack.cs b/src/SharpCompress/Compressors/Rar/UnpackV2017/Unpack.cs
index ea20a0fa..e8b29a40 100644
--- a/src/SharpCompress/Compressors/Rar/UnpackV2017/Unpack.cs
+++ b/src/SharpCompress/Compressors/Rar/UnpackV2017/Unpack.cs
@@ -1,13 +1,7 @@
 using System;
 using System.IO;
 using SharpCompress.Common.Rar.Headers;
-#if !Rar2017_64bit
 using size_t = System.UInt32;
-#else
-using nint = System.Int64;
-using nuint = System.UInt64;
-using size_t = System.UInt64;
-#endif
 
 namespace SharpCompress.Compressors.Rar.UnpackV2017;
 
diff --git a/src/SharpCompress/Compressors/Rar/UnpackV2017/Unpack.rawint_hpp.cs b/src/SharpCompress/Compressors/Rar/UnpackV2017/Unpack.rawint_hpp.cs
index f99ae0e3..46f44ac5 100644
--- a/src/SharpCompress/Compressors/Rar/UnpackV2017/Unpack.rawint_hpp.cs
+++ b/src/SharpCompress/Compressors/Rar/UnpackV2017/Unpack.rawint_hpp.cs
@@ -1,11 +1,5 @@
 using uint32 = System.UInt32;
 
-/*#if !Rar2017_64bit
-#else
-using nint = System.Int64;
-using nuint = System.UInt64;
-using size_t = System.UInt64;
-#endif*/
 
 namespace SharpCompress.Compressors.Rar.UnpackV2017;
 
diff --git a/src/SharpCompress/Compressors/Rar/UnpackV2017/Unpack.unpack20_cpp.cs b/src/SharpCompress/Compressors/Rar/UnpackV2017/Unpack.unpack20_cpp.cs
index b95d6df0..725d70ce 100644
--- a/src/SharpCompress/Compressors/Rar/UnpackV2017/Unpack.unpack20_cpp.cs
+++ b/src/SharpCompress/Compressors/Rar/UnpackV2017/Unpack.unpack20_cpp.cs
@@ -2,13 +2,6 @@ using System;
 using static SharpCompress.Compressors.Rar.UnpackV2017.PackDef;
 using static SharpCompress.Compressors.Rar.UnpackV2017.Unpack.Unpack20Local;
 
-/*#if !Rar2017_64bit
-#else
-using nint = System.Int64;
-using nuint = System.UInt64;
-using size_t = System.UInt64;
-#endif*/
-
 namespace SharpCompress.Compressors.Rar.UnpackV2017;
 
 internal partial class Unpack
diff --git a/src/SharpCompress/Compressors/Rar/UnpackV2017/Unpack.unpack50_cpp.cs b/src/SharpCompress/Compressors/Rar/UnpackV2017/Unpack.unpack50_cpp.cs
index 9631f1e1..af389904 100644
--- a/src/SharpCompress/Compressors/Rar/UnpackV2017/Unpack.unpack50_cpp.cs
+++ b/src/SharpCompress/Compressors/Rar/UnpackV2017/Unpack.unpack50_cpp.cs
@@ -3,13 +3,7 @@
 using System;
 using static SharpCompress.Compressors.Rar.UnpackV2017.PackDef;
 using static SharpCompress.Compressors.Rar.UnpackV2017.UnpackGlobal;
-#if !Rar2017_64bit
 using size_t = System.UInt32;
-#else
-using nint = System.Int64;
-using nuint = System.UInt64;
-using size_t = System.UInt64;
-#endif
 
 namespace SharpCompress.Compressors.Rar.UnpackV2017;
 
diff --git a/src/SharpCompress/Compressors/Rar/UnpackV2017/Unpack.unpackinline_cpp.cs b/src/SharpCompress/Compressors/Rar/UnpackV2017/Unpack.unpackinline_cpp.cs
index cd844004..1b4e49e2 100644
--- a/src/SharpCompress/Compressors/Rar/UnpackV2017/Unpack.unpackinline_cpp.cs
+++ b/src/SharpCompress/Compressors/Rar/UnpackV2017/Unpack.unpackinline_cpp.cs
@@ -1,12 +1,5 @@
 using static SharpCompress.Compressors.Rar.UnpackV2017.PackDef;
 
-/*#if !Rar2017_64bit
-#else
-using nint = System.Int64;
-using nuint = System.UInt64;
-using size_t = System.UInt64;
-#endif*/
-
 namespace SharpCompress.Compressors.Rar.UnpackV2017;
 
 internal partial class Unpack
diff --git a/src/SharpCompress/Compressors/Rar/UnpackV2017/unpack_hpp.cs b/src/SharpCompress/Compressors/Rar/UnpackV2017/unpack_hpp.cs
index 9f57af38..cdd584a0 100644
--- a/src/SharpCompress/Compressors/Rar/UnpackV2017/unpack_hpp.cs
+++ b/src/SharpCompress/Compressors/Rar/UnpackV2017/unpack_hpp.cs
@@ -3,13 +3,7 @@ using System.Collections.Generic;
 using static SharpCompress.Compressors.Rar.UnpackV2017.PackDef;
 using static SharpCompress.Compressors.Rar.UnpackV2017.UnpackGlobal;
 using int64 = System.Int64;
-#if !Rar2017_64bit
 using size_t = System.UInt32;
-#else
-using nint = System.Int64;
-using nuint = System.UInt64;
-using size_t = System.UInt64;
-#endif
 
 // TODO: REMOVE THIS... WIP
 #pragma warning disable 169
@@ -257,7 +251,7 @@ internal partial class Unpack
     void InitMT();
     bool UnpackLargeBlock(UnpackThreadData &D);
     bool ProcessDecoded(UnpackThreadData &D);
-    
+
     ThreadPool *UnpThreadPool;
     UnpackThreadData *UnpThreadData;
     uint MaxUserThreads;
@@ -409,7 +403,7 @@ internal partial class Unpack
     // More than 8 threads are unlikely to provide a noticeable gain
     // for unpacking, but would use the additional memory.
     void SetThreads(uint Threads) {MaxUserThreads=Min(Threads,8);}
-    
+
     void UnpackDecode(UnpackThreadData &D);
     #endif*/