diff --git a/src/NzbDrone.Core/HealthCheck/Checks/NamingConfigCheck.cs b/src/NzbDrone.Core/HealthCheck/Checks/NamingConfigCheck.cs
index 239e9d9e19..5ee0a85a4b 100644
--- a/src/NzbDrone.Core/HealthCheck/Checks/NamingConfigCheck.cs
+++ b/src/NzbDrone.Core/HealthCheck/Checks/NamingConfigCheck.cs
@@ -30,7 +30,7 @@ public override HealthCheck Check()
                 {
                     return new HealthCheck(
                         GetType(),
-                        HealthCheckResult.Warning,
+                        HealthCheckResult.Error,
                         _localizationService.GetLocalizedString(
                             "NamingConfigMovieFolderFormatDeprecatedHealthCheckMessage", new Dictionary<string, object>
                             {
diff --git a/src/NzbDrone.Core/Organizer/FileNameBuilder.cs b/src/NzbDrone.Core/Organizer/FileNameBuilder.cs
index f705b68035..e99bfe554a 100644
--- a/src/NzbDrone.Core/Organizer/FileNameBuilder.cs
+++ b/src/NzbDrone.Core/Organizer/FileNameBuilder.cs
@@ -174,29 +174,13 @@ public string GetMovieFolder(Movie movie, NamingConfig namingConfig = null)
                 namingConfig = _namingConfigService.GetConfig();
             }
 
-            var pattern = namingConfig.MovieFolderFormat;
-            var multipleTokens = TitleRegex.Matches(pattern).Count > 1;
-
             var tokenHandlers = new Dictionary<string, Func<TokenMatch, string>>(FileNameBuilderTokenEqualityComparer.Instance);
 
             AddMovieTokens(tokenHandlers, movie);
             AddReleaseDateTokens(tokenHandlers, movie.Year);
             AddIdTokens(tokenHandlers, movie);
 
-            var movieFile = movie.MovieFile;
-
-            if (movie.MovieFile != null)
-            {
-                AddQualityTokens(tokenHandlers, movie, movieFile);
-                AddMediaInfoTokens(tokenHandlers, movieFile);
-                AddMovieFileTokens(tokenHandlers, movieFile, multipleTokens);
-                AddEditionTagsTokens(tokenHandlers, movieFile);
-            }
-            else
-            {
-                AddMovieFileTokens(tokenHandlers, new MovieFile { SceneName = $"{movie.Title} {movie.Year}", RelativePath = $"{movie.Title} {movie.Year}" }, multipleTokens);
-            }
-
+            var pattern = namingConfig.MovieFolderFormat;
             var splitPatterns = pattern.Split(new char[] { '\\', '/' }, StringSplitOptions.RemoveEmptyEntries);
             var components = new List<string>();
 
diff --git a/src/NzbDrone.Core/Organizer/FileNameValidation.cs b/src/NzbDrone.Core/Organizer/FileNameValidation.cs
index fc3f6bc7e7..6b3dbbe077 100644
--- a/src/NzbDrone.Core/Organizer/FileNameValidation.cs
+++ b/src/NzbDrone.Core/Organizer/FileNameValidation.cs
@@ -60,9 +60,7 @@ protected override bool IsValid(PropertyValidatorContext context)
                 return false;
             }
 
-            // TODO: Deprecate OriginalTokenRegex use for Movie Folder Format
-            return FileNameBuilder.MovieTitleRegex.IsMatch(value) ||
-                   FileNameValidation.OriginalTokenRegex.IsMatch(value);
+            return FileNameBuilder.MovieTitleRegex.IsMatch(value);
         }
     }