diff --git a/src/game/BattleGround/BattleGround.h b/src/game/BattleGround/BattleGround.h
index 2453cce7b..951ca6a7b 100644
--- a/src/game/BattleGround/BattleGround.h
+++ b/src/game/BattleGround/BattleGround.h
@@ -420,7 +420,10 @@ class BattleGround
          *
          * @return BattleGroundTypeId
          */
-        BattleGroundTypeId GetTypeID(bool GetRandom = false) const { return GetRandom ? m_RandomTypeID : m_TypeID; }
+        BattleGroundTypeId GetTypeID(bool GetRandom = false) const
+        {
+            return GetRandom ? m_RandomTypeID : m_TypeID;
+        }
         /**
          * @brief
          *
@@ -524,7 +527,11 @@ class BattleGround
          * @return uint32
          */
         uint32 GetBonusHonorFromKill(uint32 kills) const;
-        bool IsRandom() { return m_IsRandom; }
+
+        bool IsRandom()
+        {
+            return m_IsRandom;
+        }
 
         // Set methods:
         /**
diff --git a/src/game/BattleGround/BattleGroundAA.h b/src/game/BattleGround/BattleGroundAA.h
index 0047a86e9..a68642563 100644
--- a/src/game/BattleGround/BattleGroundAA.h
+++ b/src/game/BattleGround/BattleGroundAA.h
@@ -43,6 +43,6 @@ class BattleGroundAA : public BattleGround
         BattleGroundAA();
 
         /* inherited from BattlegroundClass */
-        virtual void AddPlayer(Player* plr) override;
+        void AddPlayer(Player* plr) override;
 };
 #endif
diff --git a/src/game/BattleGround/BattleGroundAB.h b/src/game/BattleGround/BattleGroundAB.h
index 6ef229361..7ae72a4ca 100644
--- a/src/game/BattleGround/BattleGroundAB.h
+++ b/src/game/BattleGround/BattleGroundAB.h
@@ -234,7 +234,7 @@ class BattleGroundAB : public BattleGround
          * @brief
          *
          */
-        virtual void StartingEventOpenDoors() override;
+        void StartingEventOpenDoors() override;
         /**
          * @brief
          *
@@ -253,7 +253,7 @@ class BattleGroundAB : public BattleGround
          * @brief
          *
          */
-        virtual void Reset() override;
+        void Reset() override;
         /**
          * @brief
          *
@@ -266,7 +266,7 @@ class BattleGroundAB : public BattleGround
          * @param player
          * @return const WorldSafeLocsEntry
          */
-        virtual WorldSafeLocsEntry const* GetClosestGraveYard(Player* player) override;
+        WorldSafeLocsEntry const* GetClosestGraveYard(Player* player) override;
 
         /* Scorekeeping */
         /**
@@ -276,7 +276,7 @@ class BattleGroundAB : public BattleGround
          * @param type
          * @param value
          */
-        virtual void UpdatePlayerScore(Player* source, uint32 type, uint32 value) override;
+        void UpdatePlayerScore(Player* source, uint32 type, uint32 value) override;
 
         /**
          * @brief
@@ -284,7 +284,7 @@ class BattleGroundAB : public BattleGround
          * @param data
          * @param count
          */
-        virtual void FillInitialWorldStates(WorldPacket& data, uint32& count) override;
+        void FillInitialWorldStates(WorldPacket& data, uint32& count) override;
 
         /* Nodes occupying */
         /**
@@ -293,7 +293,7 @@ class BattleGroundAB : public BattleGround
          * @param source
          * @param target_obj
          */
-        virtual void EventPlayerClickedOnFlag(Player* source, GameObject* target_obj) override;
+        void EventPlayerClickedOnFlag(Player* source, GameObject* target_obj) override;
 
         /* achievement req. */
         bool IsAllNodesControlledByTeam(Team team) const override;
@@ -304,7 +304,7 @@ class BattleGroundAB : public BattleGround
          * @brief
          *
          */
-        virtual Team GetPrematureWinner() override;
+        Team GetPrematureWinner() override;
 
     private:
         /* Gameobject spawning/despawning */
diff --git a/src/game/BattleGround/BattleGroundAV.h b/src/game/BattleGround/BattleGroundAV.h
index 8a25d6be1..02031d4ba 100644
--- a/src/game/BattleGround/BattleGroundAV.h
+++ b/src/game/BattleGround/BattleGroundAV.h
@@ -400,20 +400,20 @@ class BattleGroundAV : public BattleGround
          *
          * @param plr
          */
-        virtual void AddPlayer(Player* plr) override;
+        void AddPlayer(Player* plr) override;
 
         /**
          * @brief
          *
          */
-        virtual void StartingEventOpenDoors() override;
+        void StartingEventOpenDoors() override;
         /**
          * @brief  world states
          *
          * @param data
          * @param count
          */
-        virtual void FillInitialWorldStates(WorldPacket& data, uint32& count) override;
+        void FillInitialWorldStates(WorldPacket& data, uint32& count) override;
 
         /**
          * @brief
@@ -426,7 +426,7 @@ class BattleGroundAV : public BattleGround
          * @brief
          *
          */
-        virtual void Reset() override;
+        void Reset() override;
 
         /*general stuff*/
         /**
@@ -452,7 +452,7 @@ class BattleGroundAV : public BattleGround
          * @param source
          * @param target_obj
          */
-        virtual void EventPlayerClickedOnFlag(Player* source, GameObject* target_obj) override;
+        void EventPlayerClickedOnFlag(Player* source, GameObject* target_obj) override;
         /**
          * @brief
          *
@@ -496,14 +496,14 @@ class BattleGroundAV : public BattleGround
          * @param plr
          * @return const WorldSafeLocsEntry
          */
-        virtual WorldSafeLocsEntry const* GetClosestGraveYard(Player* plr) override;
+        WorldSafeLocsEntry const* GetClosestGraveYard(Player* plr) override;
 
         /**
          * @brief
          *
          * @return Team
          */
-        virtual Team GetPrematureWinner() override;
+        Team GetPrematureWinner() override;
 
         /**
          * @brief
diff --git a/src/game/BattleGround/BattleGroundBE.h b/src/game/BattleGround/BattleGroundBE.h
index 3a02c45fc..a71b90b5a 100644
--- a/src/game/BattleGround/BattleGroundBE.h
+++ b/src/game/BattleGround/BattleGroundBE.h
@@ -42,11 +42,11 @@ class BattleGroundBE : public BattleGround
         BattleGroundBE();
 
         /* inherited from BattlegroundClass */
-        virtual void AddPlayer(Player* plr) override;
-        virtual void StartingEventOpenDoors() override;
+        void AddPlayer(Player* plr) override;
+        void StartingEventOpenDoors() override;
 
         void RemovePlayer(Player* plr, ObjectGuid guid) override;
-        virtual void FillInitialWorldStates(WorldPacket& d, uint32& count) override;
+        void FillInitialWorldStates(WorldPacket& d, uint32& count) override;
         void HandleKillPlayer(Player* player, Player* killer) override;
         bool HandlePlayerUnderMap(Player* plr) override;
 
diff --git a/src/game/BattleGround/BattleGroundDS.h b/src/game/BattleGround/BattleGroundDS.h
index 932b98cdc..92d45358e 100644
--- a/src/game/BattleGround/BattleGroundDS.h
+++ b/src/game/BattleGround/BattleGroundDS.h
@@ -47,6 +47,6 @@ class BattleGroundDS : public BattleGround
          *
          * @param plr
          */
-        virtual void AddPlayer(Player* plr) override;
+        void AddPlayer(Player* plr) override;
 };
 #endif
diff --git a/src/game/BattleGround/BattleGroundEY.h b/src/game/BattleGround/BattleGroundEY.h
index 4b6e905c9..67b38d7dc 100644
--- a/src/game/BattleGround/BattleGroundEY.h
+++ b/src/game/BattleGround/BattleGroundEY.h
@@ -248,8 +248,8 @@ class BattleGroundEY : public BattleGround
         void Update(uint32 diff) override;
 
         /* inherited from BattlegroundClass */
-        virtual void AddPlayer(Player* plr) override;
-        virtual void StartingEventOpenDoors() override;
+        void AddPlayer(Player* plr) override;
+        void StartingEventOpenDoors() override;
 
         /* BG Flags */
         ObjectGuid const& GetFlagCarrierGuid() const { return m_flagCarrier; }
@@ -266,19 +266,19 @@ class BattleGroundEY : public BattleGround
         bool HandleAreaTrigger(Player* source, uint32 trigger) override;
         void HandleKillPlayer(Player* player, Player* killer) override;
 
-        virtual WorldSafeLocsEntry const* GetClosestGraveYard(Player* player) override;
-        virtual void Reset() override;
+        WorldSafeLocsEntry const* GetClosestGraveYard(Player* player) override;
+        void Reset() override;
         void UpdateTeamScore(Team team);
         void EndBattleGround(Team winner) override;
         void UpdatePlayerScore(Player* source, uint32 type, uint32 value) override;
-        virtual void FillInitialWorldStates(WorldPacket& data, uint32& count) override;
+        void FillInitialWorldStates(WorldPacket& data, uint32& count) override;
         void SetDroppedFlagGuid(ObjectGuid guid)     { m_DroppedFlagGuid = guid;}
         void ClearDroppedFlagGuid()                  { m_DroppedFlagGuid.Clear();}
         ObjectGuid const& GetDroppedFlagGuid() const { return m_DroppedFlagGuid;}
 
         /* Battleground Events */
-        virtual void EventPlayerClickedOnFlag(Player* source, GameObject* target_obj) override;
-        virtual void EventPlayerDroppedFlag(Player* source) override;
+        void EventPlayerClickedOnFlag(Player* source, GameObject* target_obj) override;
+        void EventPlayerDroppedFlag(Player* source) override;
 
         /* achievement req. */
         bool IsAllNodesControlledByTeam(Team team) const override;
diff --git a/src/game/BattleGround/BattleGroundIC.h b/src/game/BattleGround/BattleGroundIC.h
index 7d2dfa00e..451b9dc86 100644
--- a/src/game/BattleGround/BattleGroundIC.h
+++ b/src/game/BattleGround/BattleGroundIC.h
@@ -46,7 +46,7 @@ class BattleGroundIC : public BattleGround
          *
          * @param plr
          */
-        virtual void AddPlayer(Player* plr) override;
+        void AddPlayer(Player* plr) override;
 
         /* Scorekeeping */
         void UpdatePlayerScore(Player* source, uint32 type, uint32 value) override;
diff --git a/src/game/BattleGround/BattleGroundMgr.h b/src/game/BattleGround/BattleGroundMgr.h
index 05eb2bddb..14568d91e 100644
--- a/src/game/BattleGround/BattleGroundMgr.h
+++ b/src/game/BattleGround/BattleGroundMgr.h
@@ -339,13 +339,13 @@ class BGQueueInviteEvent : public BasicEvent
          * @param p_time
          * @return bool
          */
-        virtual bool Execute(uint64 e_time, uint32 p_time) override;
+        bool Execute(uint64 e_time, uint32 p_time) override;
         /**
          * @brief
          *
          * @param e_time
          */
-        virtual void Abort(uint64 e_time) override;
+        void Abort(uint64 e_time) override;
     private:
         ObjectGuid m_PlayerGuid; /**< TODO */
         uint32 m_BgInstanceGUID; /**< TODO */
@@ -390,13 +390,13 @@ class BGQueueRemoveEvent : public BasicEvent
          * @param p_time
          * @return bool
          */
-        virtual bool Execute(uint64 e_time, uint32 p_time) override;
+        bool Execute(uint64 e_time, uint32 p_time) override;
         /**
          * @brief
          *
          * @param e_time
          */
-        virtual void Abort(uint64 e_time) override;
+        void Abort(uint64 e_time) override;
     private:
         ObjectGuid m_PlayerGuid; /**< TODO */
         uint32 m_BgInstanceGUID; /**< TODO */
diff --git a/src/game/BattleGround/BattleGroundNA.h b/src/game/BattleGround/BattleGroundNA.h
index fd4c01c1c..6b07bb2cf 100644
--- a/src/game/BattleGround/BattleGroundNA.h
+++ b/src/game/BattleGround/BattleGroundNA.h
@@ -43,11 +43,11 @@ class BattleGroundNA : public BattleGround
         BattleGroundNA();
 
         /* inherited from BattlegroundClass */
-        virtual void AddPlayer(Player* plr) override;
-        virtual void StartingEventOpenDoors() override;
+        void AddPlayer(Player* plr) override;
+        void StartingEventOpenDoors() override;
 
         void RemovePlayer(Player* plr, ObjectGuid guid) override;
-        virtual void FillInitialWorldStates(WorldPacket& d, uint32& count) override;
+        void FillInitialWorldStates(WorldPacket& d, uint32& count) override;
         void HandleKillPlayer(Player* player, Player* killer) override;
         bool HandlePlayerUnderMap(Player* plr) override;
 };
diff --git a/src/game/BattleGround/BattleGroundRB.h b/src/game/BattleGround/BattleGroundRB.h
index 5784df987..69853080e 100644
--- a/src/game/BattleGround/BattleGroundRB.h
+++ b/src/game/BattleGround/BattleGroundRB.h
@@ -46,7 +46,7 @@ class BattleGroundRB : public BattleGround
          *
          * @param plr
          */
-        virtual void AddPlayer(Player* plr) override;
+        void AddPlayer(Player* plr) override;
 
         /* Scorekeeping */
         void UpdatePlayerScore(Player* source, uint32 type, uint32 value) override;
diff --git a/src/game/BattleGround/BattleGroundRL.h b/src/game/BattleGround/BattleGroundRL.h
index 578ebece0..1eb9d0c1d 100644
--- a/src/game/BattleGround/BattleGroundRL.h
+++ b/src/game/BattleGround/BattleGroundRL.h
@@ -43,9 +43,9 @@ class BattleGroundRL : public BattleGround
         BattleGroundRL();
 
         /* inherited from BattlegroundClass */
-        virtual void AddPlayer(Player* plr) override;
-        virtual void FillInitialWorldStates(WorldPacket& d, uint32& count) override;
-        virtual void StartingEventOpenDoors() override;
+        void AddPlayer(Player* plr) override;
+        void FillInitialWorldStates(WorldPacket& d, uint32& count) override;
+        void StartingEventOpenDoors() override;
 
         void RemovePlayer(Player* plr, ObjectGuid guid) override;
         void HandleKillPlayer(Player* player, Player* killer) override;
diff --git a/src/game/BattleGround/BattleGroundRV.h b/src/game/BattleGround/BattleGroundRV.h
index 9a884c04f..c6b991b5f 100644
--- a/src/game/BattleGround/BattleGroundRV.h
+++ b/src/game/BattleGround/BattleGroundRV.h
@@ -47,6 +47,6 @@ class BattleGroundRV : public BattleGround
          *
          * @param plr
          */
-        virtual void AddPlayer(Player* plr) override;
+        void AddPlayer(Player* plr) override;
 };
 #endif
diff --git a/src/game/BattleGround/BattleGroundSA.h b/src/game/BattleGround/BattleGroundSA.h
index 97b9db285..b539b4401 100644
--- a/src/game/BattleGround/BattleGroundSA.h
+++ b/src/game/BattleGround/BattleGroundSA.h
@@ -49,7 +49,7 @@ class BattleGroundSA : public BattleGround
          *
          * @param plr
          */
-        virtual void AddPlayer(Player* plr) override;
+        void AddPlayer(Player* plr) override;
 
         /* Scorekeeping */
         void UpdatePlayerScore(Player* source, uint32 type, uint32 value) override;
diff --git a/src/game/BattleGround/BattleGroundWS.h b/src/game/BattleGround/BattleGroundWS.h
index 392be844b..fe375c197 100644
--- a/src/game/BattleGround/BattleGroundWS.h
+++ b/src/game/BattleGround/BattleGroundWS.h
@@ -161,12 +161,12 @@ class BattleGroundWS : public BattleGround
          *
          * @param plr
          */
-        virtual void AddPlayer(Player* plr) override;
+        void AddPlayer(Player* plr) override;
         /**
          * @brief
          *
          */
-        virtual void StartingEventOpenDoors() override;
+        void StartingEventOpenDoors() override;
 
         /**
          * @brief BG Flags
@@ -244,20 +244,20 @@ class BattleGroundWS : public BattleGround
          *
          * @param source
          */
-        virtual void EventPlayerDroppedFlag(Player* source) override;
+        void EventPlayerDroppedFlag(Player* source) override;
         /**
          * @brief
          *
          * @param source
          * @param target_obj
          */
-        virtual void EventPlayerClickedOnFlag(Player* source, GameObject* target_obj) override;
+        void EventPlayerClickedOnFlag(Player* source, GameObject* target_obj) override;
         /**
          * @brief
          *
          * @param source
          */
-        virtual void EventPlayerCapturedFlag(Player* source) override;
+        void EventPlayerCapturedFlag(Player* source) override;
 
         /**
          * @brief
@@ -284,7 +284,7 @@ class BattleGroundWS : public BattleGround
          * @brief
          *
          */
-        virtual void Reset() override;
+        void Reset() override;
         /**
          * @brief
          *
@@ -297,7 +297,7 @@ class BattleGroundWS : public BattleGround
          * @param player
          * @return const WorldSafeLocsEntry
          */
-        virtual WorldSafeLocsEntry const* GetClosestGraveYard(Player* player) override;
+        WorldSafeLocsEntry const* GetClosestGraveYard(Player* player) override;
         uint32 GetRemainingTimeInMinutes() { return m_EndTimer ? (m_EndTimer - 1) / (MINUTE * IN_MILLISECONDS) + 1 : 0; }
 
         /**
@@ -347,12 +347,12 @@ class BattleGroundWS : public BattleGround
          * @param data
          * @param count
          */
-        virtual void FillInitialWorldStates(WorldPacket& data, uint32& count) override;
+        void FillInitialWorldStates(WorldPacket& data, uint32& count) override;
         /**
          * @brief
          *
          */
-        virtual Team GetPrematureWinner() override;
+        Team GetPrematureWinner() override;
 
     private:
         ObjectGuid m_flagCarrierAlliance; /**< TODO */
diff --git a/src/game/Object/Creature.h b/src/game/Object/Creature.h
index e71c29961..c100d7c0c 100644
--- a/src/game/Object/Creature.h
+++ b/src/game/Object/Creature.h
@@ -741,7 +741,7 @@ class Creature : public Unit
         void SetNoSearchAssistance(bool val) { m_AlreadySearchedAssistance = val; }
         bool HasSearchedAssistance() { return m_AlreadySearchedAssistance; }
         bool CanAssistTo(const Unit* u, const Unit* enemy, bool checkfaction = true) const;
-        virtual bool CanInitiateAttack() const override;
+        bool CanInitiateAttack() const override;
 
         MovementGeneratorType GetDefaultMovementType() const { return m_defaultMovementType; }
         void SetDefaultMovementType(MovementGeneratorType mgt) { m_defaultMovementType = mgt; }
diff --git a/src/game/Object/Player.h b/src/game/Object/Player.h
index 30ff874ac..f3b6ede1e 100644
--- a/src/game/Object/Player.h
+++ b/src/game/Object/Player.h
@@ -2526,7 +2526,7 @@ class Player : public Unit
 
         Camera& GetCamera() { return m_camera; }
 
-        virtual void SetPhaseMask(uint32 newPhaseMask, bool update) override;// overwrite Unit::SetPhaseMask
+        void SetPhaseMask(uint32 newPhaseMask, bool update) override;// overwrite Unit::SetPhaseMask
 
         uint8 m_forced_speed_changes[MAX_MOVE_TYPE];
 
diff --git a/src/game/Server/WorldSession.h b/src/game/Server/WorldSession.h
index 98cc69728..72ce45927 100644
--- a/src/game/Server/WorldSession.h
+++ b/src/game/Server/WorldSession.h
@@ -183,9 +183,9 @@ class MapSessionFilter : public PacketFilter
         explicit MapSessionFilter(WorldSession* pSession) : PacketFilter(pSession) {}
         ~MapSessionFilter() {}
 
-        virtual bool Process(WorldPacket* packet) override;
+        bool Process(WorldPacket* packet) override;
         // in Map::Update() we do not process player logout!
-        virtual bool ProcessLogout() const override
+        bool ProcessLogout() const override
         {
             return false;
         }
@@ -199,7 +199,7 @@ class WorldSessionFilter : public PacketFilter
         explicit WorldSessionFilter(WorldSession* pSession) : PacketFilter(pSession) {}
         ~WorldSessionFilter() {}
 
-        virtual bool Process(WorldPacket* packet) override;
+        bool Process(WorldPacket* packet) override;
 };
 
 /// Player session in the World
diff --git a/src/game/Server/WorldSocket.h b/src/game/Server/WorldSocket.h
index 3e91603c0..a954b90e9 100644
--- a/src/game/Server/WorldSocket.h
+++ b/src/game/Server/WorldSocket.h
@@ -135,16 +135,16 @@ class WorldSocket : protected WorldHandler
         virtual ~WorldSocket(void);
 
         /// Called on open ,the void* is the acceptor.
-        virtual int open(void*) override;
+        int open(void*) override;
 
         /// Called on failures inside of the acceptor, don't call from your code.
         virtual int close(int);
 
         /// Called when we can read from the socket.
-        virtual int handle_input(ACE_HANDLE = ACE_INVALID_HANDLE) override;
+        int handle_input(ACE_HANDLE = ACE_INVALID_HANDLE) override;
 
         /// Called when the socket can write.
-        virtual int handle_output(ACE_HANDLE = ACE_INVALID_HANDLE) override;
+        int handle_output(ACE_HANDLE = ACE_INVALID_HANDLE) override;
 
         /// Called when connection is closed or error happens.
         virtual int handle_close(ACE_HANDLE = ACE_INVALID_HANDLE,
diff --git a/src/game/WorldHandlers/Map.h b/src/game/WorldHandlers/Map.h
index b774a38b4..42a5b25e5 100644
--- a/src/game/WorldHandlers/Map.h
+++ b/src/game/WorldHandlers/Map.h
@@ -212,7 +212,7 @@ class Map : public GridRefManager<NGridType>
         bool IsBattleArena() const { return i_mapEntry && i_mapEntry->IsBattleArena(); }
         bool IsBattleGroundOrArena() const { return i_mapEntry && i_mapEntry->IsBattleGroundOrArena(); }
 
-        // can't be NULL for loaded map
+        // can't be nullptr for loaded map
         MapPersistentState* GetPersistentState() const { return m_persistentState; }
 
         void AddObjectToRemoveList(WorldObject* obj);
@@ -452,7 +452,7 @@ class DungeonMap : public Map
         // can't be nullptr for loaded map
         DungeonPersistentState* GetPersistanceState() const;
 
-        virtual void InitVisibilityDistance() override;
+        void InitVisibilityDistance() override;
     private:
         bool m_resetAfterUnload;
         bool m_unloadWhenEmpty;
@@ -473,7 +473,7 @@ class BattleGroundMap : public Map
         void SetUnload();
         void UnloadAll(bool pForce) override;
 
-        virtual void InitVisibilityDistance() override;
+        void InitVisibilityDistance() override;
         BattleGround* GetBG() { return m_bg; }
         void SetBG(BattleGround* bg) { m_bg = bg; }
 
diff --git a/src/game/WorldHandlers/Spell.h b/src/game/WorldHandlers/Spell.h
index 1a842a659..732b7c440 100644
--- a/src/game/WorldHandlers/Spell.h
+++ b/src/game/WorldHandlers/Spell.h
@@ -969,9 +969,9 @@ class SpellEvent : public BasicEvent
         SpellEvent(Spell* spell);
         virtual ~SpellEvent();
 
-        virtual bool Execute(uint64 e_time, uint32 p_time) override;
-        virtual void Abort(uint64 e_time) override;
-        virtual bool IsDeletable() const override;
+        bool Execute(uint64 e_time, uint32 p_time) override;
+        void Abort(uint64 e_time) override;
+        bool IsDeletable() const override;
     protected:
         Spell* m_Spell;
 };
diff --git a/src/mangosd/AFThread.h b/src/mangosd/AFThread.h
index fd2c28995..d728377d7 100644
--- a/src/mangosd/AFThread.h
+++ b/src/mangosd/AFThread.h
@@ -32,8 +32,8 @@ class AntiFreezeThread : public ACE_Task_Base
 {
     public:
         explicit AntiFreezeThread(uint32 delay);
-        virtual int open(void*) override;
-        virtual int svc() override;
+        int open(void*) override;
+        int svc() override;
 
     private:
         uint32 m_loops;
diff --git a/src/mangosd/CliThread.h b/src/mangosd/CliThread.h
index 6c07f1109..dfa1d625e 100644
--- a/src/mangosd/CliThread.h
+++ b/src/mangosd/CliThread.h
@@ -40,7 +40,7 @@ class CliThread : public ACE_Task_Base
     enum { BUFFSIZE = 256 };
     public:
         CliThread(bool);
-        virtual int svc() override;
+        int svc() override;
         void cli_shutdown();
     private:
         char buffer_[BUFFSIZE];
diff --git a/src/mangosd/RAThread.cpp b/src/mangosd/RAThread.cpp
index e88b414cd..31c57a86c 100644
--- a/src/mangosd/RAThread.cpp
+++ b/src/mangosd/RAThread.cpp
@@ -99,7 +99,7 @@ class RASocket: protected ACE_Svc_Handler < ACE_SOCK_STREAM, ACE_NULL_SYNCH>
             sLog.outRALog("Connection was closed.");
         }
 
-        virtual int open(void* unused) override
+        int open(void* unused) override
         {
             if (reactor()->register_handler(this, ACE_Event_Handler::READ_MASK | ACE_Event_Handler::WRITE_MASK) == -1)
             {
@@ -125,7 +125,7 @@ class RASocket: protected ACE_Svc_Handler < ACE_SOCK_STREAM, ACE_NULL_SYNCH>
             return 0;
         }
 
-        virtual int close(u_long unused) override
+        int close(u_long unused) override
         {
             if (closing_)
             {
@@ -140,7 +140,7 @@ class RASocket: protected ACE_Svc_Handler < ACE_SOCK_STREAM, ACE_NULL_SYNCH>
             return 0;
         }
 
-        virtual int handle_input(ACE_HANDLE = ACE_INVALID_HANDLE) override
+        int handle_input(ACE_HANDLE = ACE_INVALID_HANDLE) override
         {
             if (closing_)
             {
@@ -276,7 +276,7 @@ class RASocket: protected ACE_Svc_Handler < ACE_SOCK_STREAM, ACE_NULL_SYNCH>
             return 0;
         }
 
-        virtual int handle_output(ACE_HANDLE h = ACE_INVALID_HANDLE) override
+        int handle_output(ACE_HANDLE h = ACE_INVALID_HANDLE) override
         {
             ACE_GUARD_RETURN(ACE_Thread_Mutex, Guard, outBufferLock, -1);
 
@@ -312,7 +312,7 @@ class RASocket: protected ACE_Svc_Handler < ACE_SOCK_STREAM, ACE_NULL_SYNCH>
             return 0;
         }
 
-        virtual int handle_close(ACE_HANDLE h = ACE_INVALID_HANDLE,
+        int handle_close(ACE_HANDLE h = ACE_INVALID_HANDLE,
                                  ACE_Reactor_Mask mask = ACE_Event_Handler::ALL_EVENTS_MASK) override
         {
             if (closing_)
diff --git a/src/mangosd/WorldThread.h b/src/mangosd/WorldThread.h
index 1203d41d2..2f66b7326 100644
--- a/src/mangosd/WorldThread.h
+++ b/src/mangosd/WorldThread.h
@@ -41,8 +41,8 @@ class WorldThread : public ACE_Task_Base
 {
     public:
         explicit WorldThread(uint16 port, const char* host);
-        virtual int open(void*) override;
-        virtual int svc() override;
+        int open(void*) override;
+        int svc() override;
     private:
         ACE_INET_Addr listen_addr;
 };
diff --git a/src/shared/Database/DatabaseMysql.h b/src/shared/Database/DatabaseMysql.h
index 5996eb412..3ce8dc735 100644
--- a/src/shared/Database/DatabaseMysql.h
+++ b/src/shared/Database/DatabaseMysql.h
@@ -64,21 +64,21 @@ class MySqlPreparedStatement : public SqlPreparedStatement
          *
          * @return bool
          */
-        virtual bool prepare() override;
+        bool prepare() override;
 
         /**
          * @brief bind input parameters
          *
          * @param holder
          */
-        virtual void bind(const SqlStmtParameters& holder) override;
+        void bind(const SqlStmtParameters& holder) override;
 
         /**
          * @brief execute DML statement
          *
          * @return bool
          */
-        virtual bool execute() override;
+        bool execute() override;
 
     protected:
         /**
@@ -259,7 +259,7 @@ class DatabaseMysql : public Database
          *
          * @return SqlConnection
          */
-        virtual SqlConnection* CreateConnection() override;
+        SqlConnection* CreateConnection() override;
 
     private:
         static size_t db_count; /**< TODO */
diff --git a/src/shared/Database/SqlPreparedStatement.h b/src/shared/Database/SqlPreparedStatement.h
index 43a0da9b0..2bf261fcd 100644
--- a/src/shared/Database/SqlPreparedStatement.h
+++ b/src/shared/Database/SqlPreparedStatement.h
@@ -801,21 +801,21 @@ class SqlPlainPreparedStatement : public SqlPreparedStatement
          *
          * @return bool
          */
-        virtual bool prepare() override { return true; }
+        bool prepare() override { return true; }
 
         /**
          * @brief we should replace all '?' symbols with substrings with proper format
          *
          * @param holder
          */
-        virtual void bind(const SqlStmtParameters& holder) override;
+        void bind(const SqlStmtParameters& holder) override;
 
         /**
          * @brief
          *
          * @return bool
          */
-        virtual bool execute() override;
+        bool execute() override;
 
     protected:
         /**