diff --git a/keyer.cpp b/keyer.cpp
index 21bdf98..d138013 100644
--- a/keyer.cpp
+++ b/keyer.cpp
@@ -38,8 +38,6 @@ static const unsigned int cwAdcDotTo = 600;
 static const unsigned int cwAdcDashFrom = cwAdcDotTo + 1;
 static const unsigned int cwAdcDashTo = 800;
 
-static const unsigned int delayBeforeCWStartTime = 50;
-
 /**
  * Starts transmitting the carrier with the sidetone
  * It assumes that we have called cwTxStart and not called cwTxStop
@@ -93,7 +91,7 @@ char update_PaddleLatch(bool isUpdateKeyState) {
   else{
     if (KeyerMode_e::KEYER_STRAIGHT != globalSettings.keyerMode)
       tmpKeyerControl = 0 ;
-    else if (paddle <= cwAdcSTTo)
+    else if (paddle <= cwAdcDashTo)
       tmpKeyerControl = DIT_L ;
      else
        tmpKeyerControl = 0 ;
@@ -156,8 +154,6 @@ void cwKeyer(void){
         case KEYED_PREP:
           //modified KD8CEC
           if (!globalSettings.txActive){
-            //DelayTime Option
-            active_delay(delayBeforeCWStartTime * 2);
             globalSettings.cwExpirationTimeMs = millis() + globalSettings.cwActiveTimeoutMs;
             startTx(TuningMode_e::TUNE_CW);
           }
@@ -205,11 +201,7 @@ void cwKeyer(void){
         // if we are here, it is only because the key is pressed
         if (!globalSettings.txActive){
           startTx(TuningMode_e::TUNE_CW);
-
-          //DelayTime Option
-          active_delay(delayBeforeCWStartTime * 2);
-
-          globalSettings.cwExpirationTimeMs = millis() + globalSettings.cwDitDurationMs;
+          globalSettings.cwExpirationTimeMs = millis() + globalSettings.cwActiveTimeoutMs;
         }
         cwKeydown();