diff --git a/src/combat.cpp b/src/combat.cpp
index d70a5d1..7cd6f2a 100644
--- a/src/combat.cpp
+++ b/src/combat.cpp
@@ -1880,7 +1880,7 @@ void Bot::checkGrenadesThrow () {
    };
 
    // check if throwing a grenade is a good thing to do...
-   if (preventibleTasks || isInNarrowPlace () || cv_ignore_enemies.bool_ () || m_isUsingGrenade || m_grenadeRequested || m_isReloading || (isKnifeMode () && !bots.isBombPlanted ()) || (m_grenadeRequested || m_grenadeCheckTime >= game.time ())) {
+   if (preventibleTasks || isInNarrowPlace () || cv_ignore_enemies.bool_ () || m_isUsingGrenade || m_grenadeRequested || m_isReloading || (isKnifeMode () && !bots.isBombPlanted ()) || m_grenadeCheckTime >= game.time ()) {
       clearThrowStates (m_states);
       return;
    }
diff --git a/src/graph.cpp b/src/graph.cpp
index 4875575..84a9729 100644
--- a/src/graph.cpp
+++ b/src/graph.cpp
@@ -1836,7 +1836,7 @@ void BotGraph::frame () {
             m_learnPosition = m_editor->v.origin;
          }
       }
-      else if (((m_editor->v.flags & FL_ONGROUND) || m_editor->v.movetype == MOVETYPE_FLY) && m_timeJumpStarted + 0.1f < game.time () && m_endJumpPoint) {
+      else if (((m_editor->v.flags & FL_ONGROUND) || m_editor->v.movetype == MOVETYPE_FLY) && m_timeJumpStarted + 0.1f < game.time ()) {
          add (NodeAddFlag::JumpEnd);
 
          m_jumpLearnNode = false;
diff --git a/src/tasks.cpp b/src/tasks.cpp
index cdb4237..f24ddf9 100644
--- a/src/tasks.cpp
+++ b/src/tasks.cpp
@@ -886,9 +886,6 @@ void Bot::defuseBomb_ () {
          m_isReloading = false;
       }
       else {
-         m_moveToGoal = false;
-         m_checkTerrain = false;
-
          m_moveSpeed = 0.0f;
          m_strafeSpeed = 0.0f;
       }