diff --git a/Sanity/p11sak-key-management-tool-basic-functionality/runtest.sh b/Sanity/p11sak-key-management-tool-basic-functionality/runtest.sh
index 490899d..d54f273 100755
--- a/Sanity/p11sak-key-management-tool-basic-functionality/runtest.sh
+++ b/Sanity/p11sak-key-management-tool-basic-functionality/runtest.sh
@@ -121,12 +121,7 @@ fi
 
 if nvrTestPackage opencryptoki '>=' 3.15.0; then
     rlPhaseStartTest "Test key removal"
-        if nvrTestPackage opencryptoki '<' 3.21.0; then
-            rlRun -s "echo '' | p11sak remove-key aes --slot $SLOT --pin $pkcsUSER_PIN --label aes_key"
-        else
-            rlFail "failing here so we won't forget to remove the workaround"
-            rlRun -s "echo 'n' | p11sak remove-key aes --slot $SLOT --pin $pkcsUSER_PIN --label aes_key"
-        fi
+        rlRun -s "echo '' | p11sak remove-key aes --slot $SLOT --pin $pkcsUSER_PIN --label aes_key"
         if nvrTestPackage opencryptoki '<' 3.21.0; then
             rlAssertGrep "Skip deleting Key. User input CKR_CANCEL" $rlRun_LOG
         else