diff --git a/Moose Development/Moose/Core/Set.lua b/Moose Development/Moose/Core/Set.lua
index c5d6c1efe..e541a66fd 100644
--- a/Moose Development/Moose/Core/Set.lua	
+++ b/Moose Development/Moose/Core/Set.lua	
@@ -2543,6 +2543,7 @@ do -- SET_UNIT
   
 end
 
+
 do -- SET_STATIC
 
   --- @type SET_STATIC
@@ -3214,8 +3215,6 @@ do -- SET_STATIC
 end
 
 
-
-
 do -- SET_CLIENT
 
 
@@ -3667,8 +3666,6 @@ do -- SET_CLIENT
 end
 
 
-
-
 do -- SET_PLAYER
 
   --- @type SET_PLAYER
@@ -4071,8 +4068,6 @@ do -- SET_PLAYER
 end
 
 
-
-
 do -- SET_AIRBASE
 
   --- @type SET_AIRBASE
@@ -4415,8 +4410,6 @@ do -- SET_AIRBASE
 end
 
 
-
-
 do -- SET_CARGO
 
   --- @type SET_CARGO
diff --git a/Moose Development/Moose/Core/SpawnStatic.lua b/Moose Development/Moose/Core/SpawnStatic.lua
index ac3b776ef..7e17d64c2 100644
--- a/Moose Development/Moose/Core/SpawnStatic.lua	
+++ b/Moose Development/Moose/Core/SpawnStatic.lua	
@@ -149,7 +149,6 @@ function SPAWNSTATIC:Spawn( Heading, NewName ) --R2.3
 end
 
 
-
 --- Creates a new @{Static} from a POINT_VEC2.
 -- @param #SPAWNSTATIC self
 -- @param Core.Point#POINT_VEC2 PointVec2 The 2D coordinate where to spawn the static.
diff --git a/Moose Development/Moose/DCS.lua b/Moose Development/Moose/DCS.lua
index c8e997f5c..f0c290904 100644
--- a/Moose Development/Moose/DCS.lua	
+++ b/Moose Development/Moose/DCS.lua	
@@ -984,8 +984,6 @@ do -- Group
   -- @param #Group self 
   -- @return #Group.Category
   
-  --TODO check coalition.side
-  
   --- Returns the coalition of the group.
   -- @function [parent=#Group] getCoalition
   -- @param #Group self 
diff --git a/Moose Development/Moose/Functional/CleanUp.lua b/Moose Development/Moose/Functional/CleanUp.lua
index 63bda13d6..23a018d29 100644
--- a/Moose Development/Moose/Functional/CleanUp.lua	
+++ b/Moose Development/Moose/Functional/CleanUp.lua	
@@ -180,7 +180,7 @@ function CLEANUP_AIRBASE.__:DestroyUnit( CleanUpUnit )
 	if CleanUpUnit then
 	  local CleanUpUnitName = CleanUpUnit:GetName()
 		local CleanUpGroup = CleanUpUnit:GetGroup()
-    -- TODO Client bug in 1.5.3
+    -- TODO DCS BUG - Client bug in 1.5.3
 		if CleanUpGroup:IsAlive() then
 			local CleanUpGroupUnits = CleanUpGroup:GetUnits()
 			if #CleanUpGroupUnits == 1 then
@@ -229,7 +229,7 @@ end
 function CLEANUP_AIRBASE.__:OnEventCrash( Event )
 	self:F( { Event } )
 
-  --TODO: This stuff is not working due to a DCS bug. Burning units cannot be destroyed.
+  --TODO: DCS BUG - This stuff is not working due to a DCS bug. Burning units cannot be destroyed.
 	-- self:T("before getGroup")
 	-- local _grp = Unit.getGroup(event.initiator)-- Identify the group that fired 
 	-- self:T("after getGroup")
diff --git a/Moose Development/Moose/Wrapper/Client.lua b/Moose Development/Moose/Wrapper/Client.lua
index 7df3c0586..462816e2c 100644
--- a/Moose Development/Moose/Wrapper/Client.lua	
+++ b/Moose Development/Moose/Wrapper/Client.lua	
@@ -433,11 +433,7 @@ function CLIENT:ShowCargo()
 
 end
 
--- TODO (1) I urgently need to revise this.
---- A local function called by the DCS World Menu system to switch off messages.
-function CLIENT.SwitchMessages( PrmTable )
-	PrmTable[1].MessageSwitch = PrmTable[2]
-end
+
 
 --- The main message driver for the CLIENT.
 -- This function displays various messages to the Player logged into the CLIENT through the DCS World Messaging system.