diff --git a/app/Models/UsenetGroup.php b/app/Models/UsenetGroup.php
index 08c806c7e..ef55a0385 100644
--- a/app/Models/UsenetGroup.php
+++ b/app/Models/UsenetGroup.php
@@ -6,7 +6,6 @@ use Blacklight\ColorCLI;
 use Blacklight\NNTP;
 use Blacklight\NZB;
 use Blacklight\ReleaseImage;
-use Blacklight\Releases;
 use Illuminate\Contracts\Pagination\LengthAwarePaginator;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\HasMany;
diff --git a/app/Services/AdditionalProcessing/AdditionalProcessingOrchestrator.php b/app/Services/AdditionalProcessing/AdditionalProcessingOrchestrator.php
index 708051ddf..cbf21df0d 100644
--- a/app/Services/AdditionalProcessing/AdditionalProcessingOrchestrator.php
+++ b/app/Services/AdditionalProcessing/AdditionalProcessingOrchestrator.php
@@ -6,8 +6,8 @@ use App\Models\Release;
 use App\Models\UsenetGroup;
 use App\Services\AdditionalProcessing\Config\ProcessingConfiguration;
 use App\Services\AdditionalProcessing\DTO\ReleaseProcessingContext;
+use App\Services\Releases\ReleaseBrowseService;
 use App\Services\TempWorkspaceService;
-use Blacklight\Releases;
 use Exception;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\DB;
@@ -248,7 +248,7 @@ class AdditionalProcessingOrchestrator
             $this->config->processThumbnails
         );
 
-        $context->passwordStatus = Releases::PASSWD_NONE;
+        $context->passwordStatus = ReleaseBrowseService::PASSWD_NONE;
         $context->releaseHasPassword = false;
         $context->releaseGroupName = UsenetGroup::getNameByID($context->release->groups_id);
         $context->releaseHasNoNFO = (int) $context->release->nfostatus !== 1;
diff --git a/app/Services/AdditionalProcessing/ArchiveExtractionService.php b/app/Services/AdditionalProcessing/ArchiveExtractionService.php
index 9693e6ba5..3ac85369d 100644
--- a/app/Services/AdditionalProcessing/ArchiveExtractionService.php
+++ b/app/Services/AdditionalProcessing/ArchiveExtractionService.php
@@ -4,7 +4,7 @@ namespace App\Services\AdditionalProcessing;
 
 use App\Services\AdditionalProcessing\Config\ProcessingConfiguration;
 use App\Services\AdditionalProcessing\DTO\ReleaseProcessingContext;
-use Blacklight\Releases;
+use App\Services\Releases\ReleaseBrowseService;
 use dariusiii\rarinfo\ArchiveInfo;
 use dariusiii\rarinfo\Par2Info;
 use Illuminate\Support\Facades\File;
@@ -45,7 +45,7 @@ class ArchiveExtractionService
             'success' => false,
             'files' => [],
             'hasPassword' => false,
-            'passwordStatus' => Releases::PASSWD_NONE,
+            'passwordStatus' => ReleaseBrowseService::PASSWD_NONE,
         ];
 
         $context->compressedFilesChecked++;
@@ -79,7 +79,7 @@ class ArchiveExtractionService
                     'success' => false,
                     'files' => [],
                     'hasPassword' => false,
-                    'passwordStatus' => Releases::PASSWD_NONE,
+                    'passwordStatus' => ReleaseBrowseService::PASSWD_NONE,
                     'standaloneVideoType' => $videoType,
                     'standaloneVideoData' => $compressedData,
                 ];
@@ -114,7 +114,7 @@ class ArchiveExtractionService
                 'success' => false,
                 'files' => [],
                 'hasPassword' => true,
-                'passwordStatus' => Releases::PASSWD_RAR,
+                'passwordStatus' => ReleaseBrowseService::PASSWD_RAR,
             ];
         }
 
@@ -134,7 +134,7 @@ class ArchiveExtractionService
             'success' => true,
             'files' => $files,
             'hasPassword' => false,
-            'passwordStatus' => Releases::PASSWD_NONE,
+            'passwordStatus' => ReleaseBrowseService::PASSWD_NONE,
             'archiveMarker' => $archiveMarker,
             'dataSummary' => $dataSummary,
         ];
@@ -204,7 +204,7 @@ class ArchiveExtractionService
             'success' => false,
             'files' => [],
             'hasPassword' => false,
-            'passwordStatus' => Releases::PASSWD_NONE,
+            'passwordStatus' => ReleaseBrowseService::PASSWD_NONE,
         ];
 
         if (! $this->config->sevenZipPath) {
@@ -219,7 +219,7 @@ class ArchiveExtractionService
                     'success' => false,
                     'files' => [],
                     'hasPassword' => true,
-                    'passwordStatus' => Releases::PASSWD_RAR,
+                    'passwordStatus' => ReleaseBrowseService::PASSWD_RAR,
                 ];
             }
 
@@ -229,7 +229,7 @@ class ArchiveExtractionService
                     'success' => true,
                     'files' => $files,
                     'hasPassword' => false,
-                    'passwordStatus' => Releases::PASSWD_NONE,
+                    'passwordStatus' => ReleaseBrowseService::PASSWD_NONE,
                     'archiveMarker' => '7z',
                 ];
             }
@@ -251,7 +251,7 @@ class ArchiveExtractionService
                 'success' => true,
                 'files' => $files,
                 'hasPassword' => false,
-                'passwordStatus' => Releases::PASSWD_NONE,
+                'passwordStatus' => ReleaseBrowseService::PASSWD_NONE,
                 'archiveMarker' => '7z',
             ];
         }
@@ -480,7 +480,7 @@ class ArchiveExtractionService
             'success' => false,
             'files' => [],
             'hasPassword' => false,
-            'passwordStatus' => Releases::PASSWD_NONE,
+            'passwordStatus' => ReleaseBrowseService::PASSWD_NONE,
         ];
 
         if ($this->config->extractUsingRarInfo || ! $this->config->sevenZipPath) {
@@ -528,7 +528,7 @@ class ArchiveExtractionService
                     'success' => true,
                     'files' => $this->filterExtractedFiles($files),
                     'hasPassword' => false,
-                    'passwordStatus' => Releases::PASSWD_NONE,
+                    'passwordStatus' => ReleaseBrowseService::PASSWD_NONE,
                     'archiveMarker' => $marker,
                 ];
             }
diff --git a/app/Services/AdditionalProcessing/ReleaseFileManager.php b/app/Services/AdditionalProcessing/ReleaseFileManager.php
index 8aeebe8a7..040b05068 100644
--- a/app/Services/AdditionalProcessing/ReleaseFileManager.php
+++ b/app/Services/AdditionalProcessing/ReleaseFileManager.php
@@ -8,7 +8,7 @@ use App\Models\Release;
 use App\Models\ReleaseFile;
 use App\Services\Search\ElasticSearchService;
 use App\Services\Search\ManticoreSearchService;
-use Blacklight\Releases;
+use App\Services\Releases\ReleaseBrowseService;
 use App\Services\AdditionalProcessing\Config\ProcessingConfiguration;
 use App\Services\AdditionalProcessing\DTO\ReleaseProcessingContext;
 use App\Services\NameFixing\NameFixingService;
@@ -63,7 +63,7 @@ class ReleaseFileManager
         // Check for password
         if (isset($file['pass']) && $file['pass'] === true) {
             $context->releaseHasPassword = true;
-            $context->passwordStatus = Releases::PASSWD_RAR;
+            $context->passwordStatus = ReleaseBrowseService::PASSWD_RAR;
             return false;
         }
 
@@ -72,7 +72,7 @@ class ReleaseFileManager
             && preg_match($this->config->innerFileBlacklist, $file['name'])
         ) {
             $context->releaseHasPassword = true;
-            $context->passwordStatus = Releases::PASSWD_RAR;
+            $context->passwordStatus = ReleaseBrowseService::PASSWD_RAR;
             return false;
         }
 
@@ -125,7 +125,7 @@ class ReleaseFileManager
                     Log::debug('Codec spam found, setting release to potentially passworded.');
                 }
                 $context->releaseHasPassword = true;
-                $context->passwordStatus = Releases::PASSWD_RAR;
+                $context->passwordStatus = ReleaseBrowseService::PASSWD_RAR;
             } elseif ($file['name'] !== '' && ! str_starts_with($file['name'], '.')) {
                 // Run PreDB filename check
                 $context->release['filename'] = $file['name'];
@@ -185,7 +185,7 @@ class ReleaseFileManager
         if (! $context->releaseHasPassword && $context->nzbHasCompressedFile && $releaseFilesCount === 0) {
             Release::query()->where('id', $context->release->id)->update($updateRows);
         } else {
-            $updateRows['passwordstatus'] = $processPasswords ? $passwordStatus : Releases::PASSWD_NONE;
+            $updateRows['passwordstatus'] = $processPasswords ? $passwordStatus : ReleaseBrowseService::PASSWD_NONE;
             $updateRows['rarinnerfilecount'] = $releaseFilesCount;
             Release::query()->where('id', $context->release->id)->update($updateRows);
         }
diff --git a/app/Services/TvProcessing/Providers/AbstractTvProvider.php b/app/Services/TvProcessing/Providers/AbstractTvProvider.php
index 77b562614..d2f30accb 100644
--- a/app/Services/TvProcessing/Providers/AbstractTvProvider.php
+++ b/app/Services/TvProcessing/Providers/AbstractTvProvider.php
@@ -9,7 +9,6 @@ use App\Models\TvEpisode;
 use App\Models\TvInfo;
 use App\Models\Video;
 use Blacklight\ColorCLI;
-use Blacklight\Releases;
 use Illuminate\Support\Facades\DB;
 
 /**