diff --git a/native/jni/src/suggest/core/policy/scoring.h b/native/jni/src/suggest/core/policy/scoring.h
index 292194bf..9e75cac 100644
--- a/native/jni/src/suggest/core/policy/scoring.h
+++ b/native/jni/src/suggest/core/policy/scoring.h
@@ -37,7 +37,6 @@
             DicNode *const terminals, const int size) const = 0;
     virtual float getDoubleLetterDemotionDistanceCost(
             const DicNode *const terminalDicNode) const = 0;
-    virtual bool doesAutoCorrectValidWord() const = 0;
     virtual bool autoCorrectsToMultiWordSuggestionIfTop() const = 0;
     virtual bool sameAsTyped(const DicTraverseSession *const traverseSession,
             const DicNode *const dicNode) const = 0;
diff --git a/native/jni/src/suggest/core/result/suggestions_output_utils.cpp b/native/jni/src/suggest/core/result/suggestions_output_utils.cpp
index 7b0e7e1..0b99b75 100644
--- a/native/jni/src/suggest/core/result/suggestions_output_utils.cpp
+++ b/native/jni/src/suggest/core/result/suggestions_output_utils.cpp
@@ -117,8 +117,7 @@
     const int finalScore = scoringPolicy->calculateFinalScore(
             compoundDistance, traverseSession->getInputSize(),
             terminalDicNode->getContainedErrorTypes(),
-            (forceCommitMultiWords && terminalDicNode->hasMultipleWords())
-                     || (isValidWord && scoringPolicy->doesAutoCorrectValidWord()),
+            (forceCommitMultiWords && terminalDicNode->hasMultipleWords()),
             boostExactMatches);
 
     // Don't output invalid or blocked offensive words. However, we still need to submit their
@@ -145,12 +144,7 @@
                 traverseSession->getDictionaryStructurePolicy()
                         ->getShortcutPositionOfPtNode(terminalDicNode->getPtNodePos()));
         const bool sameAsTyped = scoringPolicy->sameAsTyped(traverseSession, terminalDicNode);
-        const int shortcutBaseScore = scoringPolicy->doesAutoCorrectValidWord() ?
-                 scoringPolicy->calculateFinalScore(compoundDistance,
-                         traverseSession->getInputSize(),
-                         terminalDicNode->getContainedErrorTypes(),
-                         true /* forceCommit */, boostExactMatches) : finalScore;
-        outputShortcuts(&shortcutIt, shortcutBaseScore, sameAsTyped, outSuggestionResults);
+        outputShortcuts(&shortcutIt, finalScore, sameAsTyped, outSuggestionResults);
     }
 }
 
diff --git a/native/jni/src/suggest/policyimpl/typing/typing_scoring.h b/native/jni/src/suggest/policyimpl/typing/typing_scoring.h
index 66ea624..04cb660 100644
--- a/native/jni/src/suggest/policyimpl/typing/typing_scoring.h
+++ b/native/jni/src/suggest/policyimpl/typing/typing_scoring.h
@@ -69,10 +69,6 @@
         return 0.0f;
     }
 
-    AK_FORCE_INLINE bool doesAutoCorrectValidWord() const {
-        return false;
-    }
-
     AK_FORCE_INLINE bool autoCorrectsToMultiWordSuggestionIfTop() const {
         return true;
     }
