diff --git a/src/AiFactory.cpp b/src/AiFactory.cpp
index 2a0aa7af..a7471a3d 100644
--- a/src/AiFactory.cpp
+++ b/src/AiFactory.cpp
@@ -560,7 +560,7 @@ void AiFactory::AddDefaultNonCombatStrategies(Player* player, PlayerbotAI* const
                 nonCombatEngine->addStrategy("attack tagged");
 
             nonCombatEngine->addStrategy("pvp");
-            nonCombatEngine->addStrategy("collision");
+            // nonCombatEngine->addStrategy("collision");
             nonCombatEngine->addStrategy("grind");
             // nonCombatEngine->addStrategy("group");
             // nonCombatEngine->addStrategy("guild");
@@ -589,7 +589,7 @@ void AiFactory::AddDefaultNonCombatStrategies(Player* player, PlayerbotAI* const
                     if (masterBotAI || sRandomPlayerbotMgr->IsRandomBot(player))
                     {
                         nonCombatEngine->addStrategy("pvp");
-                        nonCombatEngine->addStrategy("collision");
+                        // nonCombatEngine->addStrategy("collision");
                         nonCombatEngine->addStrategy("grind");
                         // nonCombatEngine->addStrategy("group");
                         // nonCombatEngine->addStrategy("guild");
diff --git a/src/strategy/AiObjectContext.cpp b/src/strategy/AiObjectContext.cpp
index 4ee00422..95395279 100644
--- a/src/strategy/AiObjectContext.cpp
+++ b/src/strategy/AiObjectContext.cpp
@@ -73,7 +73,7 @@ std::vector<std::string> AiObjectContext::Save()
         result.push_back(out.str());
     }
 
-    return std::move(result);
+    return result;
 }
 
 void AiObjectContext::Load(std::vector<std::string> data)
diff --git a/src/strategy/Engine.cpp b/src/strategy/Engine.cpp
index d3943b60..695c62d2 100644
--- a/src/strategy/Engine.cpp
+++ b/src/strategy/Engine.cpp
@@ -545,7 +545,7 @@ std::vector<std::string> Engine::GetStrategies()
         result.push_back(i->first);
     }
 
-    return std::move(result);
+    return result;
 }
 
 void Engine::PushAgain(ActionNode* actionNode, float relevance, Event event)
diff --git a/src/strategy/NamedObjectContext.h b/src/strategy/NamedObjectContext.h
index 225d0d6d..a0db2207 100644
--- a/src/strategy/NamedObjectContext.h
+++ b/src/strategy/NamedObjectContext.h
@@ -228,7 +228,7 @@ class NamedObjectContextList
                     result.insert(*j);
             }
 
-            return std::move(result);
+            return result;
         }
 
         std::set<std::string> GetCreated()
@@ -242,7 +242,7 @@ class NamedObjectContextList
                     result.insert(*j);
             }
 
-            return std::move(result);
+            return result;
         }
 
     private:
diff --git a/src/strategy/actions/NonCombatActions.cpp b/src/strategy/actions/NonCombatActions.cpp
index c1513e64..d046efc6 100644
--- a/src/strategy/actions/NonCombatActions.cpp
+++ b/src/strategy/actions/NonCombatActions.cpp
@@ -42,10 +42,10 @@ bool DrinkAction::Execute(Event event)
         else
             delay = 20000.0f * (100 - p) / 100.0f;
 
-        botAI->CastSpell(24707, bot);
         botAI->SetNextCheckDelay(delay);
+        
 
-        return true;
+        return botAI->CastSpell(24707, bot);
     }
 
     return UseItemAction::Execute(event);
diff --git a/src/strategy/actions/SuggestWhatToDoAction.cpp b/src/strategy/actions/SuggestWhatToDoAction.cpp
index c2a7acfc..a0c0d2e4 100644
--- a/src/strategy/actions/SuggestWhatToDoAction.cpp
+++ b/src/strategy/actions/SuggestWhatToDoAction.cpp
@@ -119,7 +119,7 @@ std::vector<uint32> SuggestWhatToDoAction::GetIncompletedQuests()
             result.push_back(questId);
     }
 
-    return std::move(result);
+    return result;
 }
 
 void SuggestWhatToDoAction::specificQuest()
diff --git a/src/strategy/values/AttackersValue.cpp b/src/strategy/values/AttackersValue.cpp
index 54d1dd71..8c0626a8 100644
--- a/src/strategy/values/AttackersValue.cpp
+++ b/src/strategy/values/AttackersValue.cpp
@@ -15,7 +15,7 @@ GuidVector AttackersValue::Calculate()
 
     GuidVector result;
     if (!botAI->AllowActivity(ALL_ACTIVITY))
-        return std::move(result);
+        return result;
 
     AddAttackersOf(bot, targets);
 
@@ -30,7 +30,7 @@ GuidVector AttackersValue::Calculate()
     if (bot->duel && bot->duel->Opponent)
         result.push_back(bot->duel->Opponent->GetGUID());
 
-	return std::move(result);
+	return result;
 }
 
 void AttackersValue::AddAttackersOf(Group* group, std::set<Unit*>& targets)