diff --git a/Barotrauma/BarotraumaClient/Source/Camera.cs b/Barotrauma/BarotraumaClient/Source/Camera.cs
index 77dea4601..7b0fc0388 100644
--- a/Barotrauma/BarotraumaClient/Source/Camera.cs
+++ b/Barotrauma/BarotraumaClient/Source/Camera.cs
@@ -1,7 +1,6 @@
-using System;
-using Microsoft.Xna.Framework;
+using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Input;
-using System.Linq;
+using System;
 
 namespace Barotrauma
 {
diff --git a/Barotrauma/BarotraumaClient/Source/Characters/AI/AIController.cs b/Barotrauma/BarotraumaClient/Source/Characters/AI/AIController.cs
index 3613ba3fe..825fba7e5 100644
--- a/Barotrauma/BarotraumaClient/Source/Characters/AI/AIController.cs
+++ b/Barotrauma/BarotraumaClient/Source/Characters/AI/AIController.cs
@@ -1,6 +1,4 @@
-using Lidgren.Network;
-using Microsoft.Xna.Framework;
-using Microsoft.Xna.Framework.Graphics;
+using Microsoft.Xna.Framework.Graphics;
 
 namespace Barotrauma
 {
diff --git a/Barotrauma/BarotraumaClient/Source/Characters/AI/AITarget.cs b/Barotrauma/BarotraumaClient/Source/Characters/AI/AITarget.cs
index 05721d77b..91f2b301e 100644
--- a/Barotrauma/BarotraumaClient/Source/Characters/AI/AITarget.cs
+++ b/Barotrauma/BarotraumaClient/Source/Characters/AI/AITarget.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-using Microsoft.Xna.Framework;
+using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
 
 namespace Barotrauma
diff --git a/Barotrauma/BarotraumaClient/Source/Characters/AI/CrewCommander.cs b/Barotrauma/BarotraumaClient/Source/Characters/AI/CrewCommander.cs
index 90eaf2da9..15463f1f9 100644
--- a/Barotrauma/BarotraumaClient/Source/Characters/AI/CrewCommander.cs
+++ b/Barotrauma/BarotraumaClient/Source/Characters/AI/CrewCommander.cs
@@ -1,8 +1,8 @@
 using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
 using System;
-using System.Linq;
 using System.Collections.Generic;
+using System.Linq;
 
 namespace Barotrauma
 {
diff --git a/Barotrauma/BarotraumaClient/Source/Characters/AI/EnemyAIController.cs b/Barotrauma/BarotraumaClient/Source/Characters/AI/EnemyAIController.cs
index 9d9e6ce33..89092598f 100644
--- a/Barotrauma/BarotraumaClient/Source/Characters/AI/EnemyAIController.cs
+++ b/Barotrauma/BarotraumaClient/Source/Characters/AI/EnemyAIController.cs
@@ -1,11 +1,5 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Xml.Linq;
-using FarseerPhysics;
-using Lidgren.Network;
+using FarseerPhysics;
 using Microsoft.Xna.Framework;
-using FarseerPhysics.Dynamics;
 using Microsoft.Xna.Framework.Graphics;
 
 namespace Barotrauma
diff --git a/Barotrauma/BarotraumaClient/Source/Characters/AI/HumanAIController.cs b/Barotrauma/BarotraumaClient/Source/Characters/AI/HumanAIController.cs
index 0e9e56964..0cd62a1ad 100644
--- a/Barotrauma/BarotraumaClient/Source/Characters/AI/HumanAIController.cs
+++ b/Barotrauma/BarotraumaClient/Source/Characters/AI/HumanAIController.cs
@@ -1,5 +1,4 @@
 using Microsoft.Xna.Framework;
-using System;
 
 namespace Barotrauma
 {
diff --git a/Barotrauma/BarotraumaClient/Source/Characters/AICharacter.cs b/Barotrauma/BarotraumaClient/Source/Characters/AICharacter.cs
index 75b41a693..352b29000 100644
--- a/Barotrauma/BarotraumaClient/Source/Characters/AICharacter.cs
+++ b/Barotrauma/BarotraumaClient/Source/Characters/AICharacter.cs
@@ -1,7 +1,4 @@
-using Microsoft.Xna.Framework;
-using System;
-
-namespace Barotrauma
+namespace Barotrauma
 {
     partial class AICharacter : Character
     {
diff --git a/Barotrauma/BarotraumaClient/Source/Characters/Animation/Ragdoll.cs b/Barotrauma/BarotraumaClient/Source/Characters/Animation/Ragdoll.cs
index 1671e6c79..5fa47c8fb 100644
--- a/Barotrauma/BarotraumaClient/Source/Characters/Animation/Ragdoll.cs
+++ b/Barotrauma/BarotraumaClient/Source/Characters/Animation/Ragdoll.cs
@@ -1,13 +1,9 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Xml.Linq;
-using FarseerPhysics;
+using FarseerPhysics;
 using FarseerPhysics.Dynamics;
-using FarseerPhysics.Dynamics.Contacts;
 using FarseerPhysics.Dynamics.Joints;
 using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
+using System;
 
 namespace Barotrauma
 {
diff --git a/Barotrauma/BarotraumaClient/Source/Characters/Attack.cs b/Barotrauma/BarotraumaClient/Source/Characters/Attack.cs
index 033bbab9c..0a54164d0 100644
--- a/Barotrauma/BarotraumaClient/Source/Characters/Attack.cs
+++ b/Barotrauma/BarotraumaClient/Source/Characters/Attack.cs
@@ -1,10 +1,6 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Xml.Linq;
+using Barotrauma.Particles;
 using Microsoft.Xna.Framework;
-using Barotrauma.Particles;
+using System.Xml.Linq;
 
 namespace Barotrauma
 {
diff --git a/Barotrauma/BarotraumaClient/Source/Characters/BackgroundSprite/BackgroundCreature.cs b/Barotrauma/BarotraumaClient/Source/Characters/BackgroundSprite/BackgroundCreature.cs
index ca66e0a63..b29ffb34b 100644
--- a/Barotrauma/BarotraumaClient/Source/Characters/BackgroundSprite/BackgroundCreature.cs
+++ b/Barotrauma/BarotraumaClient/Source/Characters/BackgroundSprite/BackgroundCreature.cs
@@ -2,9 +2,6 @@
 using Microsoft.Xna.Framework.Graphics;
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Xml.Linq;
 
 namespace Barotrauma
 {
diff --git a/Barotrauma/BarotraumaClient/Source/Characters/BackgroundSprite/BackgroundCreatureManager.cs b/Barotrauma/BarotraumaClient/Source/Characters/BackgroundSprite/BackgroundCreatureManager.cs
index 443221132..c7f3ec9a0 100644
--- a/Barotrauma/BarotraumaClient/Source/Characters/BackgroundSprite/BackgroundCreatureManager.cs
+++ b/Barotrauma/BarotraumaClient/Source/Characters/BackgroundSprite/BackgroundCreatureManager.cs
@@ -3,7 +3,6 @@ using Microsoft.Xna.Framework.Graphics;
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using System.Xml.Linq;
 
 namespace Barotrauma
diff --git a/Barotrauma/BarotraumaClient/Source/Characters/BackgroundSprite/BackgroundSpriteManager.cs b/Barotrauma/BarotraumaClient/Source/Characters/BackgroundSprite/BackgroundSpriteManager.cs
index 0d722798b..6b6b9d0f9 100644
--- a/Barotrauma/BarotraumaClient/Source/Characters/BackgroundSprite/BackgroundSpriteManager.cs
+++ b/Barotrauma/BarotraumaClient/Source/Characters/BackgroundSprite/BackgroundSpriteManager.cs
@@ -2,9 +2,7 @@
 using Microsoft.Xna.Framework.Graphics;
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.Linq;
-using System.Text;
 using System.Xml.Linq;
 using Voronoi2;
 
diff --git a/Barotrauma/BarotraumaClient/Source/Characters/Character.cs b/Barotrauma/BarotraumaClient/Source/Characters/Character.cs
index 773286b8a..fc162ce9c 100644
--- a/Barotrauma/BarotraumaClient/Source/Characters/Character.cs
+++ b/Barotrauma/BarotraumaClient/Source/Characters/Character.cs
@@ -1,14 +1,13 @@
-using FarseerPhysics;
+using Barotrauma.Networking;
+using Barotrauma.Particles;
+using FarseerPhysics;
 using FarseerPhysics.Dynamics;
-using FarseerPhysics.Dynamics.Joints;
-using Barotrauma.Networking;
+using Microsoft.Xna.Framework;
+using Microsoft.Xna.Framework.Graphics;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Xml.Linq;
-using Microsoft.Xna.Framework;
-using Microsoft.Xna.Framework.Graphics;
-using Barotrauma.Particles;
 
 namespace Barotrauma
 {
diff --git a/Barotrauma/BarotraumaClient/Source/Characters/CharacterHUD.cs b/Barotrauma/BarotraumaClient/Source/Characters/CharacterHUD.cs
index 4ee4f6230..0c8a4355c 100644
--- a/Barotrauma/BarotraumaClient/Source/Characters/CharacterHUD.cs
+++ b/Barotrauma/BarotraumaClient/Source/Characters/CharacterHUD.cs
@@ -1,8 +1,8 @@
-using Barotrauma.Networking;
+using Barotrauma.Items.Components;
+using Barotrauma.Networking;
 using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
 using System;
-using Barotrauma.Items.Components;
 
 namespace Barotrauma
 {
diff --git a/Barotrauma/BarotraumaClient/Source/Characters/CharacterInfo.cs b/Barotrauma/BarotraumaClient/Source/Characters/CharacterInfo.cs
index 348b94069..d9f1afae6 100644
--- a/Barotrauma/BarotraumaClient/Source/Characters/CharacterInfo.cs
+++ b/Barotrauma/BarotraumaClient/Source/Characters/CharacterInfo.cs
@@ -1,10 +1,4 @@
 using Microsoft.Xna.Framework;
-using Microsoft.Xna.Framework.Graphics;
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Xml.Linq;
 
 namespace Barotrauma
 {
diff --git a/Barotrauma/BarotraumaClient/Source/Characters/CharacterNetworking.cs b/Barotrauma/BarotraumaClient/Source/Characters/CharacterNetworking.cs
index 51b70cafd..0faae8390 100644
--- a/Barotrauma/BarotraumaClient/Source/Characters/CharacterNetworking.cs
+++ b/Barotrauma/BarotraumaClient/Source/Characters/CharacterNetworking.cs
@@ -3,7 +3,6 @@ using Lidgren.Network;
 using Microsoft.Xna.Framework;
 using System;
 using System.Collections.Generic;
-using System.Linq;
 
 namespace Barotrauma
 {
diff --git a/Barotrauma/BarotraumaClient/Source/Characters/CharacterSound.cs b/Barotrauma/BarotraumaClient/Source/Characters/CharacterSound.cs
index fac222550..4b592f726 100644
--- a/Barotrauma/BarotraumaClient/Source/Characters/CharacterSound.cs
+++ b/Barotrauma/BarotraumaClient/Source/Characters/CharacterSound.cs
@@ -1,8 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Xml.Linq;
 
 namespace Barotrauma
diff --git a/Barotrauma/BarotraumaClient/Source/Characters/HuskInfection.cs b/Barotrauma/BarotraumaClient/Source/Characters/HuskInfection.cs
index 72350aebb..26dda3a2b 100644
--- a/Barotrauma/BarotraumaClient/Source/Characters/HuskInfection.cs
+++ b/Barotrauma/BarotraumaClient/Source/Characters/HuskInfection.cs
@@ -1,11 +1,4 @@
 using Microsoft.Xna.Framework;
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Xml.Linq;
 
 namespace Barotrauma
 {
diff --git a/Barotrauma/BarotraumaClient/Source/Characters/Jobs/JobPrefab.cs b/Barotrauma/BarotraumaClient/Source/Characters/Jobs/JobPrefab.cs
index 71ece5041..c3f3c4ff9 100644
--- a/Barotrauma/BarotraumaClient/Source/Characters/Jobs/JobPrefab.cs
+++ b/Barotrauma/BarotraumaClient/Source/Characters/Jobs/JobPrefab.cs
@@ -1,8 +1,4 @@
 using Microsoft.Xna.Framework;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Xml.Linq;
-using System.Linq;
 
 namespace Barotrauma
 {
diff --git a/Barotrauma/BarotraumaClient/Source/Characters/Limb.cs b/Barotrauma/BarotraumaClient/Source/Characters/Limb.cs
index bc0c6dbc0..63811fdd4 100644
--- a/Barotrauma/BarotraumaClient/Source/Characters/Limb.cs
+++ b/Barotrauma/BarotraumaClient/Source/Characters/Limb.cs
@@ -1,15 +1,11 @@
-using System;
-using System.Xml.Linq;
+using Barotrauma.Items.Components;
+using Barotrauma.Lights;
 using FarseerPhysics;
-using FarseerPhysics.Dynamics;
-using FarseerPhysics.Dynamics.Joints;
 using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
-using Barotrauma.Items.Components;
-using System.Collections.Generic;
-using Barotrauma.Lights;
+using System;
 using System.Linq;
-using System.IO;
+using System.Xml.Linq;
 
 namespace Barotrauma
 {
diff --git a/Barotrauma/BarotraumaClient/Source/DebugConsole.cs b/Barotrauma/BarotraumaClient/Source/DebugConsole.cs
index bc042edd2..c4af4d6fe 100644
--- a/Barotrauma/BarotraumaClient/Source/DebugConsole.cs
+++ b/Barotrauma/BarotraumaClient/Source/DebugConsole.cs
@@ -1,13 +1,11 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
+using Barotrauma.Items.Components;
+using Barotrauma.Networking;
 using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
 using Microsoft.Xna.Framework.Input;
-using Barotrauma.Networking;
-using Barotrauma.Items.Components;
-using System.Text;
-using FarseerPhysics;
+using System;
+using System.Collections.Generic;
+using System.Linq;
 
 namespace Barotrauma
 {
diff --git a/Barotrauma/BarotraumaClient/Source/EventInput/EventInput.cs b/Barotrauma/BarotraumaClient/Source/EventInput/EventInput.cs
index 7965109ad..ab70287d9 100644
--- a/Barotrauma/BarotraumaClient/Source/EventInput/EventInput.cs
+++ b/Barotrauma/BarotraumaClient/Source/EventInput/EventInput.cs
@@ -1,8 +1,8 @@
-using System;
+using Microsoft.Xna.Framework;
+using Microsoft.Xna.Framework.Input;
+using System;
 using System.Runtime.InteropServices;
 using System.Text;
-using Microsoft.Xna.Framework;
-using Microsoft.Xna.Framework.Input;
 
 namespace EventInput
 {
diff --git a/Barotrauma/BarotraumaClient/Source/Events/Missions/Mission.cs b/Barotrauma/BarotraumaClient/Source/Events/Missions/Mission.cs
index 834118cd1..dc9b959b6 100644
--- a/Barotrauma/BarotraumaClient/Source/Events/Missions/Mission.cs
+++ b/Barotrauma/BarotraumaClient/Source/Events/Missions/Mission.cs
@@ -1,10 +1,4 @@
 using Barotrauma.Networking;
-using Microsoft.Xna.Framework;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Reflection;
-using System.Xml.Linq;
 
 namespace Barotrauma
 {
diff --git a/Barotrauma/BarotraumaClient/Source/Events/Missions/MissionMode.cs b/Barotrauma/BarotraumaClient/Source/Events/Missions/MissionMode.cs
index 05387054d..d3c9c6af6 100644
--- a/Barotrauma/BarotraumaClient/Source/Events/Missions/MissionMode.cs
+++ b/Barotrauma/BarotraumaClient/Source/Events/Missions/MissionMode.cs
@@ -1,6 +1,4 @@
-using Microsoft.Xna.Framework;
-
-namespace Barotrauma
+namespace Barotrauma
 {
     partial class MissionMode : GameMode
     {
diff --git a/Barotrauma/BarotraumaClient/Source/Fonts/ScalableFont.cs b/Barotrauma/BarotraumaClient/Source/Fonts/ScalableFont.cs
index 4a061bd56..287b270f7 100644
--- a/Barotrauma/BarotraumaClient/Source/Fonts/ScalableFont.cs
+++ b/Barotrauma/BarotraumaClient/Source/Fonts/ScalableFont.cs
@@ -1,11 +1,8 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using SharpFont;
-using Microsoft.Xna.Framework;
+using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
+using SharpFont;
+using System;
+using System.Collections.Generic;
 
 namespace Barotrauma
 {
diff --git a/Barotrauma/BarotraumaClient/Source/GUI/GUIButton.cs b/Barotrauma/BarotraumaClient/Source/GUI/GUIButton.cs
index bbbee7b4a..e6b5e60c5 100644
--- a/Barotrauma/BarotraumaClient/Source/GUI/GUIButton.cs
+++ b/Barotrauma/BarotraumaClient/Source/GUI/GUIButton.cs
@@ -1,6 +1,5 @@
 using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
-using Microsoft.Xna.Framework.Input;
 
 namespace Barotrauma
 {
diff --git a/Barotrauma/BarotraumaClient/Source/GUI/GUIComponent.cs b/Barotrauma/BarotraumaClient/Source/GUI/GUIComponent.cs
index 62fdeb449..3c7dcea37 100644
--- a/Barotrauma/BarotraumaClient/Source/GUI/GUIComponent.cs
+++ b/Barotrauma/BarotraumaClient/Source/GUI/GUIComponent.cs
@@ -1,9 +1,9 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using EventInput;
+using EventInput;
 using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
+using System;
+using System.Collections.Generic;
+using System.Linq;
 
 namespace Barotrauma
 {
diff --git a/Barotrauma/BarotraumaClient/Source/GUI/GUIDropDown.cs b/Barotrauma/BarotraumaClient/Source/GUI/GUIDropDown.cs
index 2a1b8802f..250fa63a6 100644
--- a/Barotrauma/BarotraumaClient/Source/GUI/GUIDropDown.cs
+++ b/Barotrauma/BarotraumaClient/Source/GUI/GUIDropDown.cs
@@ -1,9 +1,6 @@
 using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
-using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 
 namespace Barotrauma
 {
diff --git a/Barotrauma/BarotraumaClient/Source/GUI/GUIImage.cs b/Barotrauma/BarotraumaClient/Source/GUI/GUIImage.cs
index becc471c2..7ea0abdc3 100644
--- a/Barotrauma/BarotraumaClient/Source/GUI/GUIImage.cs
+++ b/Barotrauma/BarotraumaClient/Source/GUI/GUIImage.cs
@@ -1,6 +1,6 @@
-using System;
-using Microsoft.Xna.Framework;
+using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
+using System;
 
 namespace Barotrauma
 {
diff --git a/Barotrauma/BarotraumaClient/Source/GUI/GUIListBox.cs b/Barotrauma/BarotraumaClient/Source/GUI/GUIListBox.cs
index 9ce554c0d..3b615d908 100644
--- a/Barotrauma/BarotraumaClient/Source/GUI/GUIListBox.cs
+++ b/Barotrauma/BarotraumaClient/Source/GUI/GUIListBox.cs
@@ -1,9 +1,8 @@
-using System;
-using System.Linq;
-using System.Diagnostics;
-using Microsoft.Xna.Framework;
+using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
+using System;
 using System.Collections.Generic;
+using System.Linq;
 
 namespace Barotrauma
 {
diff --git a/Barotrauma/BarotraumaClient/Source/GUI/GUINumberInput.cs b/Barotrauma/BarotraumaClient/Source/GUI/GUINumberInput.cs
index 3f4f7eb7e..74714d5c3 100644
--- a/Barotrauma/BarotraumaClient/Source/GUI/GUINumberInput.cs
+++ b/Barotrauma/BarotraumaClient/Source/GUI/GUINumberInput.cs
@@ -1,6 +1,6 @@
 using Microsoft.Xna.Framework;
-using System;
 using Microsoft.Xna.Framework.Graphics;
+using System;
 
 namespace Barotrauma
 {
diff --git a/Barotrauma/BarotraumaClient/Source/GUI/GUIScrollBar.cs b/Barotrauma/BarotraumaClient/Source/GUI/GUIScrollBar.cs
index 414f75059..c3bce0c91 100644
--- a/Barotrauma/BarotraumaClient/Source/GUI/GUIScrollBar.cs
+++ b/Barotrauma/BarotraumaClient/Source/GUI/GUIScrollBar.cs
@@ -1,6 +1,6 @@
-using System;
-using Microsoft.Xna.Framework;
+using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
+using System;
 
 namespace Barotrauma
 {
diff --git a/Barotrauma/BarotraumaClient/Source/GUI/GUIStyle.cs b/Barotrauma/BarotraumaClient/Source/GUI/GUIStyle.cs
index 4e7ffc972..906a9f5dc 100644
--- a/Barotrauma/BarotraumaClient/Source/GUI/GUIStyle.cs
+++ b/Barotrauma/BarotraumaClient/Source/GUI/GUIStyle.cs
@@ -1,6 +1,6 @@
-using System.Xml.Linq;
-using System;
+using System;
 using System.Collections.Generic;
+using System.Xml.Linq;
 
 namespace Barotrauma
 {
diff --git a/Barotrauma/BarotraumaClient/Source/GUI/GUITextBlock.cs b/Barotrauma/BarotraumaClient/Source/GUI/GUITextBlock.cs
index 402b29a3d..f842fa77b 100644
--- a/Barotrauma/BarotraumaClient/Source/GUI/GUITextBlock.cs
+++ b/Barotrauma/BarotraumaClient/Source/GUI/GUITextBlock.cs
@@ -1,6 +1,5 @@
 using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
-using System;
 
 namespace Barotrauma
 {
diff --git a/Barotrauma/BarotraumaClient/Source/GUI/GUITextBox.cs b/Barotrauma/BarotraumaClient/Source/GUI/GUITextBox.cs
index c5350f007..38dd5ac45 100644
--- a/Barotrauma/BarotraumaClient/Source/GUI/GUITextBox.cs
+++ b/Barotrauma/BarotraumaClient/Source/GUI/GUITextBox.cs
@@ -1,5 +1,4 @@
-using System;
-using EventInput;
+using EventInput;
 using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
 using Microsoft.Xna.Framework.Input;
diff --git a/Barotrauma/BarotraumaClient/Source/GUI/LoadingScreen.cs b/Barotrauma/BarotraumaClient/Source/GUI/LoadingScreen.cs
index d05d63c65..f5b7e1ac4 100644
--- a/Barotrauma/BarotraumaClient/Source/GUI/LoadingScreen.cs
+++ b/Barotrauma/BarotraumaClient/Source/GUI/LoadingScreen.cs
@@ -4,9 +4,6 @@ using Microsoft.Xna.Framework.Input;
 using Microsoft.Xna.Framework.Media;
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-using System.Text;
 
 namespace Barotrauma
 {
diff --git a/Barotrauma/BarotraumaClient/Source/GameMain.cs b/Barotrauma/BarotraumaClient/Source/GameMain.cs
index c159b74bc..b39f450a8 100644
--- a/Barotrauma/BarotraumaClient/Source/GameMain.cs
+++ b/Barotrauma/BarotraumaClient/Source/GameMain.cs
@@ -1,14 +1,14 @@
-using System;
-using System.Diagnostics;
-using System.Reflection;
+using Barotrauma.Networking;
+using Barotrauma.Particles;
 using FarseerPhysics;
 using FarseerPhysics.Dynamics;
-using Barotrauma.Networking;
-using Barotrauma.Particles;
-using System.Collections.Generic;
 using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
 using Microsoft.Xna.Framework.Input;
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Reflection;
 
 namespace Barotrauma
 {
diff --git a/Barotrauma/BarotraumaClient/Source/GameSession/CrewManager.cs b/Barotrauma/BarotraumaClient/Source/GameSession/CrewManager.cs
index b1f11e76a..c882a7960 100644
--- a/Barotrauma/BarotraumaClient/Source/GameSession/CrewManager.cs
+++ b/Barotrauma/BarotraumaClient/Source/GameSession/CrewManager.cs
@@ -1,9 +1,8 @@
-using System;
+using Microsoft.Xna.Framework;
+using Microsoft.Xna.Framework.Graphics;
+using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.IO;
-using Microsoft.Xna.Framework;
-using Microsoft.Xna.Framework.Graphics;
 using System.Xml.Linq;
 
 namespace Barotrauma
diff --git a/Barotrauma/BarotraumaClient/Source/GameSession/GameModes/SinglePlayerMode.cs b/Barotrauma/BarotraumaClient/Source/GameSession/GameModes/SinglePlayerMode.cs
index 6e009d941..4d69122d1 100644
--- a/Barotrauma/BarotraumaClient/Source/GameSession/GameModes/SinglePlayerMode.cs
+++ b/Barotrauma/BarotraumaClient/Source/GameSession/GameModes/SinglePlayerMode.cs
@@ -1,9 +1,7 @@
 using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
-using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using System.Xml.Linq;
 
 namespace Barotrauma
diff --git a/Barotrauma/BarotraumaClient/Source/GameSession/GameModes/TraitorManager.cs b/Barotrauma/BarotraumaClient/Source/GameSession/GameModes/TraitorManager.cs
index c0ad48d03..801cf452d 100644
--- a/Barotrauma/BarotraumaClient/Source/GameSession/GameModes/TraitorManager.cs
+++ b/Barotrauma/BarotraumaClient/Source/GameSession/GameModes/TraitorManager.cs
@@ -1,7 +1,4 @@
-using Barotrauma.Networking;
-using System.Collections.Generic;
-
-namespace Barotrauma
+namespace Barotrauma
 {
     partial class TraitorManager
     {
diff --git a/Barotrauma/BarotraumaClient/Source/GameSession/GameModes/Tutorials/BasicTutorial.cs b/Barotrauma/BarotraumaClient/Source/GameSession/GameModes/Tutorials/BasicTutorial.cs
index 0a391d901..e3ea9994a 100644
--- a/Barotrauma/BarotraumaClient/Source/GameSession/GameModes/Tutorials/BasicTutorial.cs
+++ b/Barotrauma/BarotraumaClient/Source/GameSession/GameModes/Tutorials/BasicTutorial.cs
@@ -4,7 +4,6 @@ using Microsoft.Xna.Framework;
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 
 namespace Barotrauma.Tutorials
 {
diff --git a/Barotrauma/BarotraumaClient/Source/GameSession/GameModes/Tutorials/TutorialMode.cs b/Barotrauma/BarotraumaClient/Source/GameSession/GameModes/Tutorials/TutorialMode.cs
index 9828e2dd4..049d05c3b 100644
--- a/Barotrauma/BarotraumaClient/Source/GameSession/GameModes/Tutorials/TutorialMode.cs
+++ b/Barotrauma/BarotraumaClient/Source/GameSession/GameModes/Tutorials/TutorialMode.cs
@@ -1,5 +1,5 @@
-using Microsoft.Xna.Framework.Graphics;
-using Barotrauma.Tutorials;
+using Barotrauma.Tutorials;
+using Microsoft.Xna.Framework.Graphics;
 
 namespace Barotrauma
 {
diff --git a/Barotrauma/BarotraumaClient/Source/GameSession/GameSession.cs b/Barotrauma/BarotraumaClient/Source/GameSession/GameSession.cs
index 1254f63e8..f1a18b19c 100644
--- a/Barotrauma/BarotraumaClient/Source/GameSession/GameSession.cs
+++ b/Barotrauma/BarotraumaClient/Source/GameSession/GameSession.cs
@@ -1,6 +1,6 @@
-using System;
-using Microsoft.Xna.Framework;
+using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
+using System;
 using System.Xml.Linq;
 
 namespace Barotrauma
diff --git a/Barotrauma/BarotraumaClient/Source/GameSettings.cs b/Barotrauma/BarotraumaClient/Source/GameSettings.cs
index 598933a88..a70c4d5f6 100644
--- a/Barotrauma/BarotraumaClient/Source/GameSettings.cs
+++ b/Barotrauma/BarotraumaClient/Source/GameSettings.cs
@@ -4,7 +4,6 @@ using Microsoft.Xna.Framework.Input;
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using System.Xml.Linq;
 
 namespace Barotrauma
diff --git a/Barotrauma/BarotraumaClient/Source/Items/CharacterInventory.cs b/Barotrauma/BarotraumaClient/Source/Items/CharacterInventory.cs
index cebb34a89..1464ced80 100644
--- a/Barotrauma/BarotraumaClient/Source/Items/CharacterInventory.cs
+++ b/Barotrauma/BarotraumaClient/Source/Items/CharacterInventory.cs
@@ -1,12 +1,5 @@
-using System;
-using System.Linq;
-using Microsoft.Xna.Framework;
+using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
-using Microsoft.Xna.Framework.Input;
-using Barotrauma.Networking;
-using Lidgren.Network;
-using System.Collections.Generic;
-using Barotrauma.Items.Components;
 
 namespace Barotrauma
 {
diff --git a/Barotrauma/BarotraumaClient/Source/Items/Components/Door.cs b/Barotrauma/BarotraumaClient/Source/Items/Components/Door.cs
index 9810da3d9..193ce722a 100644
--- a/Barotrauma/BarotraumaClient/Source/Items/Components/Door.cs
+++ b/Barotrauma/BarotraumaClient/Source/Items/Components/Door.cs
@@ -1,14 +1,8 @@
 using Barotrauma.Lights;
 using Barotrauma.Networking;
-using FarseerPhysics;
-using FarseerPhysics.Dynamics;
 using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
 using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Xml.Linq;
 
 
 namespace Barotrauma.Items.Components
diff --git a/Barotrauma/BarotraumaClient/Source/Items/Components/ItemComponent.cs b/Barotrauma/BarotraumaClient/Source/Items/Components/ItemComponent.cs
index 72140c4ba..197284497 100644
--- a/Barotrauma/BarotraumaClient/Source/Items/Components/ItemComponent.cs
+++ b/Barotrauma/BarotraumaClient/Source/Items/Components/ItemComponent.cs
@@ -1,13 +1,12 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Reflection;
-using System.Xml.Linq;
+using Barotrauma.Networking;
 using Lidgren.Network;
 using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
-using Barotrauma.Networking;
+using System;
+using System.Collections.Generic;
 using System.IO;
+using System.Linq;
+using System.Xml.Linq;
 
 namespace Barotrauma.Items.Components
 {
diff --git a/Barotrauma/BarotraumaClient/Source/Items/Components/ItemContainer.cs b/Barotrauma/BarotraumaClient/Source/Items/Components/ItemContainer.cs
index 1c8136e49..6005dde45 100644
--- a/Barotrauma/BarotraumaClient/Source/Items/Components/ItemContainer.cs
+++ b/Barotrauma/BarotraumaClient/Source/Items/Components/ItemContainer.cs
@@ -1,10 +1,6 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Xml.Linq;
-using FarseerPhysics;
-using Microsoft.Xna.Framework;
+using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
+using System.Xml.Linq;
 
 namespace Barotrauma.Items.Components
 {
diff --git a/Barotrauma/BarotraumaClient/Source/Items/Components/LightComponent.cs b/Barotrauma/BarotraumaClient/Source/Items/Components/LightComponent.cs
index 31e077742..048956421 100644
--- a/Barotrauma/BarotraumaClient/Source/Items/Components/LightComponent.cs
+++ b/Barotrauma/BarotraumaClient/Source/Items/Components/LightComponent.cs
@@ -1,9 +1,7 @@
-using Microsoft.Xna.Framework;
-using Barotrauma.Lights;
-using System;
-using System.Xml.Linq;
+using Barotrauma.Lights;
 using Barotrauma.Networking;
 using Lidgren.Network;
+using Microsoft.Xna.Framework;
 
 namespace Barotrauma.Items.Components
 {
diff --git a/Barotrauma/BarotraumaClient/Source/Items/Components/Machines/Deconstructor.cs b/Barotrauma/BarotraumaClient/Source/Items/Components/Machines/Deconstructor.cs
index 9571bfa23..b637b0289 100644
--- a/Barotrauma/BarotraumaClient/Source/Items/Components/Machines/Deconstructor.cs
+++ b/Barotrauma/BarotraumaClient/Source/Items/Components/Machines/Deconstructor.cs
@@ -1,12 +1,6 @@
 using Barotrauma.Networking;
 using Lidgren.Network;
-using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Xml.Linq;
 
 namespace Barotrauma.Items.Components
 {
diff --git a/Barotrauma/BarotraumaClient/Source/Items/Components/Machines/Engine.cs b/Barotrauma/BarotraumaClient/Source/Items/Components/Machines/Engine.cs
index 33eac0bce..228b7af76 100644
--- a/Barotrauma/BarotraumaClient/Source/Items/Components/Machines/Engine.cs
+++ b/Barotrauma/BarotraumaClient/Source/Items/Components/Machines/Engine.cs
@@ -1,11 +1,5 @@
 using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Linq;
-using System.Text;
-using System.Xml.Linq;
 
 namespace Barotrauma.Items.Components
 {
diff --git a/Barotrauma/BarotraumaClient/Source/Items/Components/Machines/Fabricator.cs b/Barotrauma/BarotraumaClient/Source/Items/Components/Machines/Fabricator.cs
index b6f7d3dcb..63176af8a 100644
--- a/Barotrauma/BarotraumaClient/Source/Items/Components/Machines/Fabricator.cs
+++ b/Barotrauma/BarotraumaClient/Source/Items/Components/Machines/Fabricator.cs
@@ -5,8 +5,6 @@ using Microsoft.Xna.Framework.Graphics;
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using System.Xml.Linq;
 
 namespace Barotrauma.Items.Components
 {
diff --git a/Barotrauma/BarotraumaClient/Source/Items/Components/Machines/MiniMap.cs b/Barotrauma/BarotraumaClient/Source/Items/Components/Machines/MiniMap.cs
index 06934b0a0..425f2b6cc 100644
--- a/Barotrauma/BarotraumaClient/Source/Items/Components/Machines/MiniMap.cs
+++ b/Barotrauma/BarotraumaClient/Source/Items/Components/Machines/MiniMap.cs
@@ -1,8 +1,6 @@
-using System;
-using System.Xml.Linq;
-using Microsoft.Xna.Framework;
+using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
-using System.Collections.Generic;
+using System;
 using System.Linq;
 
 namespace Barotrauma.Items.Components
diff --git a/Barotrauma/BarotraumaClient/Source/Items/Components/Machines/Pump.cs b/Barotrauma/BarotraumaClient/Source/Items/Components/Machines/Pump.cs
index 8080b4b8c..63777556f 100644
--- a/Barotrauma/BarotraumaClient/Source/Items/Components/Machines/Pump.cs
+++ b/Barotrauma/BarotraumaClient/Source/Items/Components/Machines/Pump.cs
@@ -1,10 +1,6 @@
 using Barotrauma.Networking;
 using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
-using System;
-using System.Collections.Specialized;
-using System.Globalization;
-using System.Xml.Linq;
 
 namespace Barotrauma.Items.Components
 {
diff --git a/Barotrauma/BarotraumaClient/Source/Items/Components/Machines/Radar.cs b/Barotrauma/BarotraumaClient/Source/Items/Components/Machines/Radar.cs
index 54ea185e9..22c462db4 100644
--- a/Barotrauma/BarotraumaClient/Source/Items/Components/Machines/Radar.cs
+++ b/Barotrauma/BarotraumaClient/Source/Items/Components/Machines/Radar.cs
@@ -4,7 +4,6 @@ using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
 using System;
 using System.Collections.Generic;
-using System.Xml.Linq;
 using Voronoi2;
 
 namespace Barotrauma.Items.Components
diff --git a/Barotrauma/BarotraumaClient/Source/Items/Components/Machines/Reactor.cs b/Barotrauma/BarotraumaClient/Source/Items/Components/Machines/Reactor.cs
index 3f9d63446..12341263a 100644
--- a/Barotrauma/BarotraumaClient/Source/Items/Components/Machines/Reactor.cs
+++ b/Barotrauma/BarotraumaClient/Source/Items/Components/Machines/Reactor.cs
@@ -1,10 +1,9 @@
-using System;
-using System.Collections.Generic;
-using System.Xml.Linq;
+using Barotrauma.Networking;
 using Lidgren.Network;
 using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
-using Barotrauma.Networking;
+using System;
+using System.Collections.Generic;
 
 namespace Barotrauma.Items.Components
 {
diff --git a/Barotrauma/BarotraumaClient/Source/Items/Components/Machines/Steering.cs b/Barotrauma/BarotraumaClient/Source/Items/Components/Machines/Steering.cs
index 4915421a8..c3bacaa8b 100644
--- a/Barotrauma/BarotraumaClient/Source/Items/Components/Machines/Steering.cs
+++ b/Barotrauma/BarotraumaClient/Source/Items/Components/Machines/Steering.cs
@@ -3,12 +3,6 @@ using FarseerPhysics;
 using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
 using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Linq;
-using System.Text;
-using System.Xml.Linq;
-using Voronoi2;
 
 namespace Barotrauma.Items.Components
 {
diff --git a/Barotrauma/BarotraumaClient/Source/Items/Components/Power/PowerContainer.cs b/Barotrauma/BarotraumaClient/Source/Items/Components/Power/PowerContainer.cs
index 3865d26f8..e113317cc 100644
--- a/Barotrauma/BarotraumaClient/Source/Items/Components/Power/PowerContainer.cs
+++ b/Barotrauma/BarotraumaClient/Source/Items/Components/Power/PowerContainer.cs
@@ -1,9 +1,7 @@
-using System;
-using System.Xml.Linq;
+using Barotrauma.Networking;
+using Lidgren.Network;
 using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
-using Barotrauma.Networking;
-using Lidgren.Network;
 
 namespace Barotrauma.Items.Components
 {
diff --git a/Barotrauma/BarotraumaClient/Source/Items/Components/Power/PowerTransfer.cs b/Barotrauma/BarotraumaClient/Source/Items/Components/Power/PowerTransfer.cs
index 977762f01..67c72484b 100644
--- a/Barotrauma/BarotraumaClient/Source/Items/Components/Power/PowerTransfer.cs
+++ b/Barotrauma/BarotraumaClient/Source/Items/Components/Power/PowerTransfer.cs
@@ -1,10 +1,5 @@
-using System.Collections.Generic;
-using System.Xml.Linq;
-using Microsoft.Xna.Framework;
+using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
-using System;
-using System.Globalization;
-using System.Linq;
 
 namespace Barotrauma.Items.Components
 {
diff --git a/Barotrauma/BarotraumaClient/Source/Items/Components/Power/Powered.cs b/Barotrauma/BarotraumaClient/Source/Items/Components/Power/Powered.cs
index 7ccebf862..aec73ebb3 100644
--- a/Barotrauma/BarotraumaClient/Source/Items/Components/Power/Powered.cs
+++ b/Barotrauma/BarotraumaClient/Source/Items/Components/Power/Powered.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Xml.Linq;
-
-namespace Barotrauma.Items.Components
+namespace Barotrauma.Items.Components
 {
     partial class Powered : ItemComponent
     {
diff --git a/Barotrauma/BarotraumaClient/Source/Items/Components/Signal/Connection.cs b/Barotrauma/BarotraumaClient/Source/Items/Components/Signal/Connection.cs
index 85b8f4723..25a887888 100644
--- a/Barotrauma/BarotraumaClient/Source/Items/Components/Signal/Connection.cs
+++ b/Barotrauma/BarotraumaClient/Source/Items/Components/Signal/Connection.cs
@@ -1,7 +1,6 @@
 using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
 using System;
-using System.Collections.Generic;
 using System.Linq;
 using System.Xml.Linq;
 
diff --git a/Barotrauma/BarotraumaClient/Source/Items/Components/Signal/ConnectionPanel.cs b/Barotrauma/BarotraumaClient/Source/Items/Components/Signal/ConnectionPanel.cs
index 0f8382f2c..2e2602b02 100644
--- a/Barotrauma/BarotraumaClient/Source/Items/Components/Signal/ConnectionPanel.cs
+++ b/Barotrauma/BarotraumaClient/Source/Items/Components/Signal/ConnectionPanel.cs
@@ -1,11 +1,6 @@
 using Barotrauma.Networking;
-using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
-using System;
-using System.Linq;
-using System.Collections.Generic;
 using System.Xml.Linq;
-using Lidgren.Network;
 
 namespace Barotrauma.Items.Components
 {
diff --git a/Barotrauma/BarotraumaClient/Source/Items/Components/Signal/Wire.cs b/Barotrauma/BarotraumaClient/Source/Items/Components/Signal/Wire.cs
index 34af1192a..1aa2b8b39 100644
--- a/Barotrauma/BarotraumaClient/Source/Items/Components/Signal/Wire.cs
+++ b/Barotrauma/BarotraumaClient/Source/Items/Components/Signal/Wire.cs
@@ -1,12 +1,9 @@
 using Barotrauma.Networking;
-using Lidgren.Network;
 using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
 using Microsoft.Xna.Framework.Input;
-using System;
 using System.Collections.Generic;
 using System.Globalization;
-using System.Linq;
 using System.Xml.Linq;
 
 namespace Barotrauma.Items.Components
diff --git a/Barotrauma/BarotraumaClient/Source/Items/Components/StatusHUD.cs b/Barotrauma/BarotraumaClient/Source/Items/Components/StatusHUD.cs
index 9d4c274e5..eed61271d 100644
--- a/Barotrauma/BarotraumaClient/Source/Items/Components/StatusHUD.cs
+++ b/Barotrauma/BarotraumaClient/Source/Items/Components/StatusHUD.cs
@@ -1,10 +1,7 @@
-using Microsoft.Xna.Framework.Graphics;
+using Microsoft.Xna.Framework;
+using Microsoft.Xna.Framework.Graphics;
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Xml.Linq;
-using Microsoft.Xna.Framework;
 
 namespace Barotrauma.Items.Components
 {
diff --git a/Barotrauma/BarotraumaClient/Source/Items/Components/Turret.cs b/Barotrauma/BarotraumaClient/Source/Items/Components/Turret.cs
index 2ec831fc0..6c5fdab91 100644
--- a/Barotrauma/BarotraumaClient/Source/Items/Components/Turret.cs
+++ b/Barotrauma/BarotraumaClient/Source/Items/Components/Turret.cs
@@ -1,12 +1,8 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Xml.Linq;
+using Barotrauma.Networking;
+using Lidgren.Network;
 using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
-using FarseerPhysics;
-using Barotrauma.Networking;
-using Lidgren.Network;
+using System;
 
 namespace Barotrauma.Items.Components
 {
diff --git a/Barotrauma/BarotraumaClient/Source/Items/DockingPort.cs b/Barotrauma/BarotraumaClient/Source/Items/DockingPort.cs
index 699b05976..f7de0dab8 100644
--- a/Barotrauma/BarotraumaClient/Source/Items/DockingPort.cs
+++ b/Barotrauma/BarotraumaClient/Source/Items/DockingPort.cs
@@ -1,17 +1,6 @@
 using Barotrauma.Networking;
-using FarseerPhysics;
-using FarseerPhysics.Dynamics;
-using FarseerPhysics.Dynamics.Joints;
-using FarseerPhysics.Factories;
 using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Xml.Linq;
 
 namespace Barotrauma.Items.Components
 {
diff --git a/Barotrauma/BarotraumaClient/Source/Items/FixRequirement.cs b/Barotrauma/BarotraumaClient/Source/Items/FixRequirement.cs
index 58dff356f..009a97100 100644
--- a/Barotrauma/BarotraumaClient/Source/Items/FixRequirement.cs
+++ b/Barotrauma/BarotraumaClient/Source/Items/FixRequirement.cs
@@ -2,10 +2,6 @@
 using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Xml.Linq;
 
 namespace Barotrauma
 {
diff --git a/Barotrauma/BarotraumaClient/Source/Items/Inventory.cs b/Barotrauma/BarotraumaClient/Source/Items/Inventory.cs
index fb58735ff..e0ce8f5be 100644
--- a/Barotrauma/BarotraumaClient/Source/Items/Inventory.cs
+++ b/Barotrauma/BarotraumaClient/Source/Items/Inventory.cs
@@ -1,12 +1,7 @@
-using System.Linq;
-using Lidgren.Network;
+using Barotrauma.Items.Components;
 using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
-using Microsoft.Xna.Framework.Input;
-using Barotrauma.Networking;
-using System;
 using System.Collections.Generic;
-using Barotrauma.Items.Components;
 
 namespace Barotrauma
 {
diff --git a/Barotrauma/BarotraumaClient/Source/Items/ItemPrefab.cs b/Barotrauma/BarotraumaClient/Source/Items/ItemPrefab.cs
index 16142e255..ec30e9a61 100644
--- a/Barotrauma/BarotraumaClient/Source/Items/ItemPrefab.cs
+++ b/Barotrauma/BarotraumaClient/Source/Items/ItemPrefab.cs
@@ -1,11 +1,6 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Xml.Linq;
-using FarseerPhysics;
-using Microsoft.Xna.Framework;
+using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
-using Microsoft.Xna.Framework.Input;
+using System;
 
 namespace Barotrauma
 {
diff --git a/Barotrauma/BarotraumaClient/Source/Items/Rope.cs b/Barotrauma/BarotraumaClient/Source/Items/Rope.cs
index 2db3e76e4..c93f9e003 100644
--- a/Barotrauma/BarotraumaClient/Source/Items/Rope.cs
+++ b/Barotrauma/BarotraumaClient/Source/Items/Rope.cs
@@ -1,13 +1,5 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Xml.Linq;
-using FarseerPhysics;
-using FarseerPhysics.Collision.Shapes;
-using FarseerPhysics.Common;
-using FarseerPhysics.Dynamics;
+using FarseerPhysics;
 using FarseerPhysics.Dynamics.Joints;
-using FarseerPhysics.Factories;
 using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
 
diff --git a/Barotrauma/BarotraumaClient/Source/Map/Explosion.cs b/Barotrauma/BarotraumaClient/Source/Map/Explosion.cs
index 364a357b4..376c50d95 100644
--- a/Barotrauma/BarotraumaClient/Source/Map/Explosion.cs
+++ b/Barotrauma/BarotraumaClient/Source/Map/Explosion.cs
@@ -1,10 +1,6 @@
-using Microsoft.Xna.Framework;
-using Barotrauma.Lights;
-using System;
+using Barotrauma.Lights;
+using Microsoft.Xna.Framework;
 using System.Collections.Generic;
-using System.Xml.Linq;
-using Barotrauma.Networking;
-using FarseerPhysics;
 
 namespace Barotrauma
 {
diff --git a/Barotrauma/BarotraumaClient/Source/Map/FireSource.cs b/Barotrauma/BarotraumaClient/Source/Map/FireSource.cs
index 8ae3b14d6..dc8d058c9 100644
--- a/Barotrauma/BarotraumaClient/Source/Map/FireSource.cs
+++ b/Barotrauma/BarotraumaClient/Source/Map/FireSource.cs
@@ -1,10 +1,7 @@
 using Barotrauma.Lights;
 using Microsoft.Xna.Framework;
 using System;
-using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using Barotrauma.Networking;
 
 namespace Barotrauma
 {
diff --git a/Barotrauma/BarotraumaClient/Source/Map/Gap.cs b/Barotrauma/BarotraumaClient/Source/Map/Gap.cs
index 5bc347cdc..6f6368938 100644
--- a/Barotrauma/BarotraumaClient/Source/Map/Gap.cs
+++ b/Barotrauma/BarotraumaClient/Source/Map/Gap.cs
@@ -1,11 +1,7 @@
-using System;
-using System.Collections.Generic;
-using System.Xml.Linq;
-using FarseerPhysics;
-using Microsoft.Xna.Framework;
+using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
-using System.Collections.ObjectModel;
-using Barotrauma.Items.Components;
+using System;
+using System.Xml.Linq;
 
 namespace Barotrauma
 {
diff --git a/Barotrauma/BarotraumaClient/Source/Map/Hull.cs b/Barotrauma/BarotraumaClient/Source/Map/Hull.cs
index 79814ac16..e5255d49b 100644
--- a/Barotrauma/BarotraumaClient/Source/Map/Hull.cs
+++ b/Barotrauma/BarotraumaClient/Source/Map/Hull.cs
@@ -1,14 +1,8 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Linq;
-using System.Xml.Linq;
-using FarseerPhysics;
-using FarseerPhysics.Dynamics;
+using Barotrauma.Networking;
 using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
-using Lidgren.Network;
-using Barotrauma.Networking;
+using System;
+using System.Xml.Linq;
 
 namespace Barotrauma
 {
diff --git a/Barotrauma/BarotraumaClient/Source/Map/Levels/CaveGenerator.cs b/Barotrauma/BarotraumaClient/Source/Map/Levels/CaveGenerator.cs
index 8c318a2b4..6bc67482c 100644
--- a/Barotrauma/BarotraumaClient/Source/Map/Levels/CaveGenerator.cs
+++ b/Barotrauma/BarotraumaClient/Source/Map/Levels/CaveGenerator.cs
@@ -1,15 +1,8 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-using System.Text;
-using Microsoft.Xna.Framework;
-using Voronoi2;
+using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
-using FarseerPhysics;
-using FarseerPhysics.Common;
-using FarseerPhysics.Dynamics;
-using FarseerPhysics.Factories;
+using System;
+using System.Collections.Generic;
+using Voronoi2;
 
 namespace Barotrauma
 {
diff --git a/Barotrauma/BarotraumaClient/Source/Map/Levels/Level.cs b/Barotrauma/BarotraumaClient/Source/Map/Levels/Level.cs
index a3cd883fb..4ca62ed1e 100644
--- a/Barotrauma/BarotraumaClient/Source/Map/Levels/Level.cs
+++ b/Barotrauma/BarotraumaClient/Source/Map/Levels/Level.cs
@@ -1,16 +1,5 @@
-using FarseerPhysics;
-using FarseerPhysics.Common;
-using FarseerPhysics.Dynamics;
-using FarseerPhysics.Factories;
-using Lidgren.Network;
-using Microsoft.Xna.Framework;
+using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
-using System;
-using System.Linq;
-using System.Collections.Generic;
-using System.Diagnostics;
-using Voronoi2;
-using Barotrauma.RuinGeneration;
 
 namespace Barotrauma
 {
diff --git a/Barotrauma/BarotraumaClient/Source/Map/Levels/LevelRenderer.cs b/Barotrauma/BarotraumaClient/Source/Map/Levels/LevelRenderer.cs
index fb05b856d..6fa8abd97 100644
--- a/Barotrauma/BarotraumaClient/Source/Map/Levels/LevelRenderer.cs
+++ b/Barotrauma/BarotraumaClient/Source/Map/Levels/LevelRenderer.cs
@@ -1,10 +1,6 @@
 using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
 using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-using System.Text;
 using Voronoi2;
 
 namespace Barotrauma
diff --git a/Barotrauma/BarotraumaClient/Source/Map/Levels/Ruins/RuinGenerator.cs b/Barotrauma/BarotraumaClient/Source/Map/Levels/Ruins/RuinGenerator.cs
index 5a5e343b7..eb61f08d3 100644
--- a/Barotrauma/BarotraumaClient/Source/Map/Levels/Ruins/RuinGenerator.cs
+++ b/Barotrauma/BarotraumaClient/Source/Map/Levels/Ruins/RuinGenerator.cs
@@ -1,9 +1,5 @@
 using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-using Voronoi2;
 
 namespace Barotrauma.RuinGeneration
 {
diff --git a/Barotrauma/BarotraumaClient/Source/Map/Levels/WaterRenderer.cs b/Barotrauma/BarotraumaClient/Source/Map/Levels/WaterRenderer.cs
index 87e0b26a1..130b41319 100644
--- a/Barotrauma/BarotraumaClient/Source/Map/Levels/WaterRenderer.cs
+++ b/Barotrauma/BarotraumaClient/Source/Map/Levels/WaterRenderer.cs
@@ -1,7 +1,7 @@
-using System;
-using Microsoft.Xna.Framework;
-using Microsoft.Xna.Framework.Graphics;
+using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Content;
+using Microsoft.Xna.Framework.Graphics;
+using System;
 
 namespace Barotrauma
 {
diff --git a/Barotrauma/BarotraumaClient/Source/Map/Levels/WrappingWall.cs b/Barotrauma/BarotraumaClient/Source/Map/Levels/WrappingWall.cs
index c1e2fb655..9070c66cb 100644
--- a/Barotrauma/BarotraumaClient/Source/Map/Levels/WrappingWall.cs
+++ b/Barotrauma/BarotraumaClient/Source/Map/Levels/WrappingWall.cs
@@ -1,12 +1,5 @@
-using FarseerPhysics;
-using Microsoft.Xna.Framework;
-using Microsoft.Xna.Framework.Graphics;
+using Microsoft.Xna.Framework.Graphics;
 using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-using System.Text;
-using Voronoi2;
 
 namespace Barotrauma
 {
diff --git a/Barotrauma/BarotraumaClient/Source/Map/Lights/ConvexHull.cs b/Barotrauma/BarotraumaClient/Source/Map/Lights/ConvexHull.cs
index 3d455da6c..75434c17b 100644
--- a/Barotrauma/BarotraumaClient/Source/Map/Lights/ConvexHull.cs
+++ b/Barotrauma/BarotraumaClient/Source/Map/Lights/ConvexHull.cs
@@ -3,7 +3,6 @@ using Microsoft.Xna.Framework.Graphics;
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
-using System.Linq;
 
 namespace Barotrauma.Lights
 {
diff --git a/Barotrauma/BarotraumaClient/Source/Map/Lights/LightManager.cs b/Barotrauma/BarotraumaClient/Source/Map/Lights/LightManager.cs
index 44355c81b..41646398f 100644
--- a/Barotrauma/BarotraumaClient/Source/Map/Lights/LightManager.cs
+++ b/Barotrauma/BarotraumaClient/Source/Map/Lights/LightManager.cs
@@ -1,7 +1,6 @@
 using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.Linq;
 
 namespace Barotrauma.Lights
diff --git a/Barotrauma/BarotraumaClient/Source/Map/LinkedSubmarine.cs b/Barotrauma/BarotraumaClient/Source/Map/LinkedSubmarine.cs
index 1a42db8dc..00898f3a0 100644
--- a/Barotrauma/BarotraumaClient/Source/Map/LinkedSubmarine.cs
+++ b/Barotrauma/BarotraumaClient/Source/Map/LinkedSubmarine.cs
@@ -2,12 +2,8 @@
 using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
 using Microsoft.Xna.Framework.Input;
-using System;
-using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Xml.Linq;
 
 namespace Barotrauma
diff --git a/Barotrauma/BarotraumaClient/Source/Map/Map.cs b/Barotrauma/BarotraumaClient/Source/Map/Map.cs
index 14d4da9f0..595528af4 100644
--- a/Barotrauma/BarotraumaClient/Source/Map/Map.cs
+++ b/Barotrauma/BarotraumaClient/Source/Map/Map.cs
@@ -4,7 +4,6 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Xml.Linq;
-using Voronoi2;
 
 namespace Barotrauma
 {
diff --git a/Barotrauma/BarotraumaClient/Source/Map/Map/Location.cs b/Barotrauma/BarotraumaClient/Source/Map/Map/Location.cs
index 98f463cdc..87291ab57 100644
--- a/Barotrauma/BarotraumaClient/Source/Map/Map/Location.cs
+++ b/Barotrauma/BarotraumaClient/Source/Map/Map/Location.cs
@@ -1,7 +1,4 @@
-using Microsoft.Xna.Framework;
-using System.Collections.Generic;
-
-namespace Barotrauma
+namespace Barotrauma
 {
     partial class Location
     {
diff --git a/Barotrauma/BarotraumaClient/Source/Map/MapEntity.cs b/Barotrauma/BarotraumaClient/Source/Map/MapEntity.cs
index 3a4b59fff..e50c5d7d3 100644
--- a/Barotrauma/BarotraumaClient/Source/Map/MapEntity.cs
+++ b/Barotrauma/BarotraumaClient/Source/Map/MapEntity.cs
@@ -1,14 +1,11 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-using System.Xml.Linq;
-using FarseerPhysics;
+using Barotrauma.Items.Components;
 using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
 using Microsoft.Xna.Framework.Input;
-using System.Collections.ObjectModel;
-using Barotrauma.Items.Components;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Xml.Linq;
 
 namespace Barotrauma
 {
diff --git a/Barotrauma/BarotraumaClient/Source/Map/MapEntityPrefab.cs b/Barotrauma/BarotraumaClient/Source/Map/MapEntityPrefab.cs
index d40ed0588..d4a7fb1d3 100644
--- a/Barotrauma/BarotraumaClient/Source/Map/MapEntityPrefab.cs
+++ b/Barotrauma/BarotraumaClient/Source/Map/MapEntityPrefab.cs
@@ -1,9 +1,6 @@
-using System;
-using System.Collections.Generic;
-using System.Reflection;
-using Microsoft.Xna.Framework;
+using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
-using Microsoft.Xna.Framework.Input;
+using System;
 
 namespace Barotrauma
 {
diff --git a/Barotrauma/BarotraumaClient/Source/Map/Structure.cs b/Barotrauma/BarotraumaClient/Source/Map/Structure.cs
index 2e44d22dc..243cfb94d 100644
--- a/Barotrauma/BarotraumaClient/Source/Map/Structure.cs
+++ b/Barotrauma/BarotraumaClient/Source/Map/Structure.cs
@@ -1,16 +1,11 @@
-using System;
+using Barotrauma.Lights;
+using Barotrauma.Networking;
+using Microsoft.Xna.Framework;
+using Microsoft.Xna.Framework.Graphics;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Xml.Linq;
-using FarseerPhysics;
-using FarseerPhysics.Dynamics;
-using FarseerPhysics.Dynamics.Contacts;
-using FarseerPhysics.Factories;
-using Lidgren.Network;
-using Microsoft.Xna.Framework;
-using Microsoft.Xna.Framework.Graphics;
-using Barotrauma.Networking;
-using Barotrauma.Lights;
 
 namespace Barotrauma
 {
diff --git a/Barotrauma/BarotraumaClient/Source/Map/StructurePrefab.cs b/Barotrauma/BarotraumaClient/Source/Map/StructurePrefab.cs
index 61af7e934..3092d38b5 100644
--- a/Barotrauma/BarotraumaClient/Source/Map/StructurePrefab.cs
+++ b/Barotrauma/BarotraumaClient/Source/Map/StructurePrefab.cs
@@ -1,8 +1,5 @@
-using System;
-using System.Xml.Linq;
-using Microsoft.Xna.Framework;
+using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
-using System.Collections.Generic;
 
 namespace Barotrauma
 {
diff --git a/Barotrauma/BarotraumaClient/Source/Map/Submarine.cs b/Barotrauma/BarotraumaClient/Source/Map/Submarine.cs
index a16c7fa8c..39837fb47 100644
--- a/Barotrauma/BarotraumaClient/Source/Map/Submarine.cs
+++ b/Barotrauma/BarotraumaClient/Source/Map/Submarine.cs
@@ -1,18 +1,11 @@
 using Barotrauma.Networking;
 using FarseerPhysics;
-using FarseerPhysics.Common;
-using FarseerPhysics.Dynamics;
-using Lidgren.Network;
 using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
 using System;
 using System.Collections.Generic;
-using System.ComponentModel;
-using System.IO;
 using System.Linq;
-using System.Reflection;
 using System.Xml.Linq;
-using Voronoi2;
 
 namespace Barotrauma
 {
diff --git a/Barotrauma/BarotraumaClient/Source/Map/WayPoint.cs b/Barotrauma/BarotraumaClient/Source/Map/WayPoint.cs
index 03a84a51b..fbdcabc0d 100644
--- a/Barotrauma/BarotraumaClient/Source/Map/WayPoint.cs
+++ b/Barotrauma/BarotraumaClient/Source/Map/WayPoint.cs
@@ -1,14 +1,8 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Xml.Linq;
-using FarseerPhysics;
-using Microsoft.Xna.Framework;
+using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
+using System;
+using System.Xml.Linq;
 //using Microsoft.Xna.Framework.Input;
-using System.Collections.ObjectModel;
-using Barotrauma.Items.Components;
-using FarseerPhysics.Dynamics;
 
 namespace Barotrauma
 {
diff --git a/Barotrauma/BarotraumaClient/Source/Networking/BanList.cs b/Barotrauma/BarotraumaClient/Source/Networking/BanList.cs
index e0cf41a44..9588275bb 100644
--- a/Barotrauma/BarotraumaClient/Source/Networking/BanList.cs
+++ b/Barotrauma/BarotraumaClient/Source/Networking/BanList.cs
@@ -1,9 +1,4 @@
 using Microsoft.Xna.Framework;
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Text;
 
 namespace Barotrauma.Networking
 {
diff --git a/Barotrauma/BarotraumaClient/Source/Networking/EntitySpawner.cs b/Barotrauma/BarotraumaClient/Source/Networking/EntitySpawner.cs
index 62165c7a3..1e1df0f69 100644
--- a/Barotrauma/BarotraumaClient/Source/Networking/EntitySpawner.cs
+++ b/Barotrauma/BarotraumaClient/Source/Networking/EntitySpawner.cs
@@ -1,8 +1,4 @@
 using Barotrauma.Networking;
-using Microsoft.Xna.Framework;
-using System;
-using System.Collections.Generic;
-using System.Linq;
 
 namespace Barotrauma
 {
diff --git a/Barotrauma/BarotraumaClient/Source/Networking/FileTransfer/FileReceiver.cs b/Barotrauma/BarotraumaClient/Source/Networking/FileTransfer/FileReceiver.cs
index d84c24702..c7e9109cd 100644
--- a/Barotrauma/BarotraumaClient/Source/Networking/FileTransfer/FileReceiver.cs
+++ b/Barotrauma/BarotraumaClient/Source/Networking/FileTransfer/FileReceiver.cs
@@ -3,7 +3,6 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Text.RegularExpressions;
 using System.Xml;
 
 namespace Barotrauma.Networking
diff --git a/Barotrauma/BarotraumaClient/Source/Networking/GameClient.cs b/Barotrauma/BarotraumaClient/Source/Networking/GameClient.cs
index 9a1e69919..cfc994bc7 100644
--- a/Barotrauma/BarotraumaClient/Source/Networking/GameClient.cs
+++ b/Barotrauma/BarotraumaClient/Source/Networking/GameClient.cs
@@ -1,11 +1,11 @@
-using System;
-using Lidgren.Network;
+using Lidgren.Network;
 using Microsoft.Xna.Framework;
+using System;
 using System.Collections.Generic;
-using System.IO;
-using System.Text;
 using System.ComponentModel;
+using System.IO;
 using System.Linq;
+using System.Text;
 
 namespace Barotrauma.Networking
 {
diff --git a/Barotrauma/BarotraumaClient/Source/Networking/GameServer.cs b/Barotrauma/BarotraumaClient/Source/Networking/GameServer.cs
index 025401c59..57a83b08a 100644
--- a/Barotrauma/BarotraumaClient/Source/Networking/GameServer.cs
+++ b/Barotrauma/BarotraumaClient/Source/Networking/GameServer.cs
@@ -1,12 +1,7 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-using System.Text;
-using Lidgren.Network;
+using Lidgren.Network;
 using Microsoft.Xna.Framework;
-using RestSharp;
-using Barotrauma.Items.Components;
+using System;
+using System.Linq;
 
 namespace Barotrauma.Networking
 {
diff --git a/Barotrauma/BarotraumaClient/Source/Networking/GameServerSettings.cs b/Barotrauma/BarotraumaClient/Source/Networking/GameServerSettings.cs
index 6a96813bb..72fe0a72b 100644
--- a/Barotrauma/BarotraumaClient/Source/Networking/GameServerSettings.cs
+++ b/Barotrauma/BarotraumaClient/Source/Networking/GameServerSettings.cs
@@ -1,11 +1,7 @@
 using Microsoft.Xna.Framework;
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Linq;
-using System.Text;
-using System.Xml;
-using System.Xml.Linq;
 
 namespace Barotrauma.Networking
 {
diff --git a/Barotrauma/BarotraumaClient/Source/Networking/NetEntityEvent/ClientEntityEventManager.cs b/Barotrauma/BarotraumaClient/Source/Networking/NetEntityEvent/ClientEntityEventManager.cs
index 3f66e4cf2..464166a39 100644
--- a/Barotrauma/BarotraumaClient/Source/Networking/NetEntityEvent/ClientEntityEventManager.cs
+++ b/Barotrauma/BarotraumaClient/Source/Networking/NetEntityEvent/ClientEntityEventManager.cs
@@ -1,9 +1,6 @@
 using Lidgren.Network;
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Barotrauma.Networking
 {
diff --git a/Barotrauma/BarotraumaClient/Source/Networking/NetStats.cs b/Barotrauma/BarotraumaClient/Source/Networking/NetStats.cs
index bdc19a3e6..373c2ecda 100644
--- a/Barotrauma/BarotraumaClient/Source/Networking/NetStats.cs
+++ b/Barotrauma/BarotraumaClient/Source/Networking/NetStats.cs
@@ -1,9 +1,7 @@
 using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
-using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 
 namespace Barotrauma.Networking
 {
diff --git a/Barotrauma/BarotraumaClient/Source/Networking/NetworkMember.cs b/Barotrauma/BarotraumaClient/Source/Networking/NetworkMember.cs
index 6729be024..6bc3ea1cb 100644
--- a/Barotrauma/BarotraumaClient/Source/Networking/NetworkMember.cs
+++ b/Barotrauma/BarotraumaClient/Source/Networking/NetworkMember.cs
@@ -1,11 +1,5 @@
-using System;
-using System.Linq;
-using Microsoft.Xna.Framework;
-using Microsoft.Xna.Framework.Graphics;
-using Microsoft.Xna.Framework.Input;
-using System.Collections.Generic;
-using Lidgren.Network;
-using Barotrauma.Items.Components;
+using Microsoft.Xna.Framework;
+using System;
 
 namespace Barotrauma.Networking
 {
diff --git a/Barotrauma/BarotraumaClient/Source/Networking/ServerLog.cs b/Barotrauma/BarotraumaClient/Source/Networking/ServerLog.cs
index d461ce03a..2b3061784 100644
--- a/Barotrauma/BarotraumaClient/Source/Networking/ServerLog.cs
+++ b/Barotrauma/BarotraumaClient/Source/Networking/ServerLog.cs
@@ -1,7 +1,5 @@
 using Microsoft.Xna.Framework;
 using System;
-using System.Collections.Generic;
-using System.IO;
 using System.Linq;
 
 namespace Barotrauma.Networking
diff --git a/Barotrauma/BarotraumaClient/Source/Networking/Voting.cs b/Barotrauma/BarotraumaClient/Source/Networking/Voting.cs
index dcf11f2f2..c4b080b92 100644
--- a/Barotrauma/BarotraumaClient/Source/Networking/Voting.cs
+++ b/Barotrauma/BarotraumaClient/Source/Networking/Voting.cs
@@ -1,10 +1,7 @@
 using Barotrauma.Networking;
 using Lidgren.Network;
 using Microsoft.Xna.Framework;
-using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 
 namespace Barotrauma
 {
diff --git a/Barotrauma/BarotraumaClient/Source/Networking/WhiteList.cs b/Barotrauma/BarotraumaClient/Source/Networking/WhiteList.cs
index 6dffa40ee..a60f7ed6f 100644
--- a/Barotrauma/BarotraumaClient/Source/Networking/WhiteList.cs
+++ b/Barotrauma/BarotraumaClient/Source/Networking/WhiteList.cs
@@ -1,9 +1,5 @@
 using Microsoft.Xna.Framework;
-using System;
-using System.Collections.Generic;
-using System.IO;
 using System.Linq;
-using System.Text;
 
 namespace Barotrauma.Networking
 {
diff --git a/Barotrauma/BarotraumaClient/Source/Particles/ParticleEmitter.cs b/Barotrauma/BarotraumaClient/Source/Particles/ParticleEmitter.cs
index 3defc25f0..4b17c0104 100644
--- a/Barotrauma/BarotraumaClient/Source/Particles/ParticleEmitter.cs
+++ b/Barotrauma/BarotraumaClient/Source/Particles/ParticleEmitter.cs
@@ -1,7 +1,6 @@
-using System.Xml.Linq;
-using Microsoft.Xna.Framework;
-using FarseerPhysics;
+using Microsoft.Xna.Framework;
 using System;
+using System.Xml.Linq;
 
 namespace Barotrauma.Particles
 {
diff --git a/Barotrauma/BarotraumaClient/Source/Particles/ParticleManager.cs b/Barotrauma/BarotraumaClient/Source/Particles/ParticleManager.cs
index 40adebd87..1359f82c5 100644
--- a/Barotrauma/BarotraumaClient/Source/Particles/ParticleManager.cs
+++ b/Barotrauma/BarotraumaClient/Source/Particles/ParticleManager.cs
@@ -1,9 +1,8 @@
-using System;
+using Microsoft.Xna.Framework;
+using Microsoft.Xna.Framework.Graphics;
+using System;
 using System.Collections.Generic;
 using System.Xml.Linq;
-using FarseerPhysics;
-using Microsoft.Xna.Framework;
-using Microsoft.Xna.Framework.Graphics;
 
 namespace Barotrauma.Particles
 {
diff --git a/Barotrauma/BarotraumaClient/Source/Particles/ParticlePrefab.cs b/Barotrauma/BarotraumaClient/Source/Particles/ParticlePrefab.cs
index 0308c1fa1..ef13959c3 100644
--- a/Barotrauma/BarotraumaClient/Source/Particles/ParticlePrefab.cs
+++ b/Barotrauma/BarotraumaClient/Source/Particles/ParticlePrefab.cs
@@ -1,7 +1,7 @@
-using System.Xml.Linq;
+using FarseerPhysics;
 using Microsoft.Xna.Framework;
-using FarseerPhysics;
 using System.Collections.Generic;
+using System.Xml.Linq;
 
 namespace Barotrauma.Particles
 {
diff --git a/Barotrauma/BarotraumaClient/Source/Physics/PhysicsBody.cs b/Barotrauma/BarotraumaClient/Source/Physics/PhysicsBody.cs
index e78b244e3..33262bee8 100644
--- a/Barotrauma/BarotraumaClient/Source/Physics/PhysicsBody.cs
+++ b/Barotrauma/BarotraumaClient/Source/Physics/PhysicsBody.cs
@@ -1,10 +1,6 @@
-using System.Xml.Linq;
-using FarseerPhysics;
-using FarseerPhysics.Dynamics;
-using FarseerPhysics.Factories;
+using FarseerPhysics;
 using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
-using System.Collections.Generic;
 using System;
 
 namespace Barotrauma
diff --git a/Barotrauma/BarotraumaClient/Source/Program.cs b/Barotrauma/BarotraumaClient/Source/Program.cs
index ca47685cb..baed741e2 100644
--- a/Barotrauma/BarotraumaClient/Source/Program.cs
+++ b/Barotrauma/BarotraumaClient/Source/Program.cs
@@ -2,11 +2,9 @@
 
 using System;
 using System.IO;
-using System.Reflection;
 using System.Text;
 
 #if WINDOWS
-using System.Management;
 using System.Windows.Forms;
 using Microsoft.Xna.Framework.Graphics;
 #endif
diff --git a/Barotrauma/BarotraumaClient/Source/Screens/BlurEffect.cs b/Barotrauma/BarotraumaClient/Source/Screens/BlurEffect.cs
index 7f444cd42..4228233ea 100644
--- a/Barotrauma/BarotraumaClient/Source/Screens/BlurEffect.cs
+++ b/Barotrauma/BarotraumaClient/Source/Screens/BlurEffect.cs
@@ -1,10 +1,6 @@
 using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Barotrauma
 {
diff --git a/Barotrauma/BarotraumaClient/Source/Screens/EditCharacterScreen.cs b/Barotrauma/BarotraumaClient/Source/Screens/EditCharacterScreen.cs
index 8404c7aa9..59dda0aec 100644
--- a/Barotrauma/BarotraumaClient/Source/Screens/EditCharacterScreen.cs
+++ b/Barotrauma/BarotraumaClient/Source/Screens/EditCharacterScreen.cs
@@ -1,10 +1,10 @@
-using System;
-using System.Linq;
-using FarseerPhysics;
+using FarseerPhysics;
 using FarseerPhysics.Dynamics.Joints;
 using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
+using System;
 using System.Collections.Generic;
+using System.Linq;
 
 namespace Barotrauma
 {
diff --git a/Barotrauma/BarotraumaClient/Source/Screens/EditMapScreen.cs b/Barotrauma/BarotraumaClient/Source/Screens/EditMapScreen.cs
index 9214cb9da..9ead99dc9 100644
--- a/Barotrauma/BarotraumaClient/Source/Screens/EditMapScreen.cs
+++ b/Barotrauma/BarotraumaClient/Source/Screens/EditMapScreen.cs
@@ -1,7 +1,6 @@
 using Barotrauma.Items.Components;
 using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
-using Microsoft.Xna.Framework.Input;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
diff --git a/Barotrauma/BarotraumaClient/Source/Screens/GameScreen.cs b/Barotrauma/BarotraumaClient/Source/Screens/GameScreen.cs
index b8c95f332..e18879867 100644
--- a/Barotrauma/BarotraumaClient/Source/Screens/GameScreen.cs
+++ b/Barotrauma/BarotraumaClient/Source/Screens/GameScreen.cs
@@ -1,8 +1,7 @@
-using System;
-using Microsoft.Xna.Framework;
-using Microsoft.Xna.Framework.Graphics;
+using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Content;
-using Microsoft.Xna.Framework.Input;
+using Microsoft.Xna.Framework.Graphics;
+using System;
 
 namespace Barotrauma
 {
diff --git a/Barotrauma/BarotraumaClient/Source/Screens/LobbyScreen.cs b/Barotrauma/BarotraumaClient/Source/Screens/LobbyScreen.cs
index 26305c993..e0e75c142 100644
--- a/Barotrauma/BarotraumaClient/Source/Screens/LobbyScreen.cs
+++ b/Barotrauma/BarotraumaClient/Source/Screens/LobbyScreen.cs
@@ -1,9 +1,9 @@
 using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
 using System;
-using System.Linq;
 using System.Collections.Generic;
 using System.Globalization;
+using System.Linq;
 
 namespace Barotrauma
 {
diff --git a/Barotrauma/BarotraumaClient/Source/Screens/MainMenuScreen.cs b/Barotrauma/BarotraumaClient/Source/Screens/MainMenuScreen.cs
index d5fe3ccd7..b97166aa8 100644
--- a/Barotrauma/BarotraumaClient/Source/Screens/MainMenuScreen.cs
+++ b/Barotrauma/BarotraumaClient/Source/Screens/MainMenuScreen.cs
@@ -1,10 +1,10 @@
-using System;
+using Barotrauma.Networking;
 using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
-using Barotrauma.Networking;
+using System;
+using System.IO;
 using System.Linq;
 using System.Xml.Linq;
-using System.IO;
 
 namespace Barotrauma
 {
diff --git a/Barotrauma/BarotraumaClient/Source/Screens/NetLobbyScreen.cs b/Barotrauma/BarotraumaClient/Source/Screens/NetLobbyScreen.cs
index b658a9330..fda6ab2f4 100644
--- a/Barotrauma/BarotraumaClient/Source/Screens/NetLobbyScreen.cs
+++ b/Barotrauma/BarotraumaClient/Source/Screens/NetLobbyScreen.cs
@@ -1,11 +1,11 @@
-using System;
+using Barotrauma.Networking;
 using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
-using Barotrauma.Networking;
-using System.Linq;
+using System;
 using System.Collections.Generic;
-using System.Reflection;
 using System.ComponentModel;
+using System.Linq;
+using System.Reflection;
 
 namespace Barotrauma
 {
diff --git a/Barotrauma/BarotraumaClient/Source/Screens/ServerListScreen.cs b/Barotrauma/BarotraumaClient/Source/Screens/ServerListScreen.cs
index 34d823409..650fc35e9 100644
--- a/Barotrauma/BarotraumaClient/Source/Screens/ServerListScreen.cs
+++ b/Barotrauma/BarotraumaClient/Source/Screens/ServerListScreen.cs
@@ -1,9 +1,9 @@
-using System;
+using Barotrauma.Networking;
 using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
-using Barotrauma.Networking;
-using System.Collections.Generic;
 using RestSharp;
+using System;
+using System.Collections.Generic;
 
 namespace Barotrauma
 {
diff --git a/Barotrauma/BarotraumaClient/Source/Sounds/OggSound.cs b/Barotrauma/BarotraumaClient/Source/Sounds/OggSound.cs
index b06d320b8..37aa0a313 100644
--- a/Barotrauma/BarotraumaClient/Source/Sounds/OggSound.cs
+++ b/Barotrauma/BarotraumaClient/Source/Sounds/OggSound.cs
@@ -1,6 +1,6 @@
-using System;
-using NVorbis;
+using NVorbis;
 using OpenTK.Audio.OpenAL;
+using System;
 
 namespace Barotrauma.Sounds
 {
diff --git a/Barotrauma/BarotraumaClient/Source/Sounds/OggStream.cs b/Barotrauma/BarotraumaClient/Source/Sounds/OggStream.cs
index c94fd491c..8f88dfbb8 100644
--- a/Barotrauma/BarotraumaClient/Source/Sounds/OggStream.cs
+++ b/Barotrauma/BarotraumaClient/Source/Sounds/OggStream.cs
@@ -1,11 +1,11 @@
-using System;
+using NVorbis;
+using OpenTK.Audio.OpenAL;
+using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Threading;
-using NVorbis;
-using OpenTK.Audio.OpenAL;
 
 namespace Barotrauma.Sounds
 {
diff --git a/Barotrauma/BarotraumaClient/Source/Sounds/Sound.cs b/Barotrauma/BarotraumaClient/Source/Sounds/Sound.cs
index 34714f97d..bf6eab0e1 100644
--- a/Barotrauma/BarotraumaClient/Source/Sounds/Sound.cs
+++ b/Barotrauma/BarotraumaClient/Source/Sounds/Sound.cs
@@ -1,11 +1,9 @@
 
+using Barotrauma.Sounds;
+using Microsoft.Xna.Framework;
+using System;
 using System.Collections.Generic;
 using System.IO;
-using FarseerPhysics;
-using FarseerPhysics.Dynamics;
-using Microsoft.Xna.Framework;
-using Barotrauma.Sounds;
-using System;
 
 namespace Barotrauma
 {
diff --git a/Barotrauma/BarotraumaClient/Source/Sounds/SoundManager.cs b/Barotrauma/BarotraumaClient/Source/Sounds/SoundManager.cs
index c78954e06..2f6185b66 100644
--- a/Barotrauma/BarotraumaClient/Source/Sounds/SoundManager.cs
+++ b/Barotrauma/BarotraumaClient/Source/Sounds/SoundManager.cs
@@ -1,9 +1,8 @@
-using System.Collections.Generic;
-using Microsoft.Xna.Framework;
-using OpenTK.Audio.OpenAL;
+using Microsoft.Xna.Framework;
 using OpenTK.Audio;
-
+using OpenTK.Audio.OpenAL;
 using System;
+using System.Collections.Generic;
 
 namespace Barotrauma.Sounds
 {
diff --git a/Barotrauma/BarotraumaClient/Source/Sounds/SoundPlayer.cs b/Barotrauma/BarotraumaClient/Source/Sounds/SoundPlayer.cs
index 60e9689ef..d46c64c3d 100644
--- a/Barotrauma/BarotraumaClient/Source/Sounds/SoundPlayer.cs
+++ b/Barotrauma/BarotraumaClient/Source/Sounds/SoundPlayer.cs
@@ -1,13 +1,11 @@
-using System;
+using Barotrauma.Sounds;
+using Microsoft.Xna.Framework;
+using System;
+using System.Collections.Generic;
 using System.Diagnostics;
+using System.IO;
 using System.Linq;
 using System.Xml.Linq;
-using FarseerPhysics;
-using FarseerPhysics.Dynamics;
-using Microsoft.Xna.Framework;
-using Barotrauma.Sounds;
-using System.Collections.Generic;
-using System.IO;
 
 namespace Barotrauma
 {
diff --git a/Barotrauma/BarotraumaClient/Source/Sprite/Sprite.cs b/Barotrauma/BarotraumaClient/Source/Sprite/Sprite.cs
index ce9146202..86bc750d0 100644
--- a/Barotrauma/BarotraumaClient/Source/Sprite/Sprite.cs
+++ b/Barotrauma/BarotraumaClient/Source/Sprite/Sprite.cs
@@ -1,9 +1,7 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using Microsoft.Xna.Framework;
+using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
-using System.Xml.Linq;
+using System;
+using System.IO;
 
 namespace Barotrauma
 {
diff --git a/Barotrauma/BarotraumaClient/Source/Sprite/SpriteSheet.cs b/Barotrauma/BarotraumaClient/Source/Sprite/SpriteSheet.cs
index 3dc8436a7..43a51c91c 100644
--- a/Barotrauma/BarotraumaClient/Source/Sprite/SpriteSheet.cs
+++ b/Barotrauma/BarotraumaClient/Source/Sprite/SpriteSheet.cs
@@ -1,6 +1,4 @@
 using Microsoft.Xna.Framework;
-using System;
-using System.Xml.Linq;
 using Microsoft.Xna.Framework.Graphics;
 
 namespace Barotrauma
diff --git a/Barotrauma/BarotraumaClient/Source/Utils/MathUtils.cs b/Barotrauma/BarotraumaClient/Source/Utils/MathUtils.cs
index fbf1e9e30..d8b4d38d1 100644
--- a/Barotrauma/BarotraumaClient/Source/Utils/MathUtils.cs
+++ b/Barotrauma/BarotraumaClient/Source/Utils/MathUtils.cs
@@ -1,8 +1,5 @@
 using Microsoft.Xna.Framework;
-using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 
 namespace Barotrauma
 {
diff --git a/Barotrauma/BarotraumaClient/Source/Utils/SaveUtil.cs b/Barotrauma/BarotraumaClient/Source/Utils/SaveUtil.cs
index 1b5570ded..6a0fa9cd1 100644
--- a/Barotrauma/BarotraumaClient/Source/Utils/SaveUtil.cs
+++ b/Barotrauma/BarotraumaClient/Source/Utils/SaveUtil.cs
@@ -1,7 +1,6 @@
 using System;
 using System.IO;
 using System.IO.Compression;
-using System.Text;
 using System.Xml.Linq;
 
 namespace Barotrauma
diff --git a/Barotrauma/BarotraumaClient/Source/Utils/TextureLoader.cs b/Barotrauma/BarotraumaClient/Source/Utils/TextureLoader.cs
index b005384c8..2e47ee19b 100644
--- a/Barotrauma/BarotraumaClient/Source/Utils/TextureLoader.cs
+++ b/Barotrauma/BarotraumaClient/Source/Utils/TextureLoader.cs
@@ -1,7 +1,7 @@
-using System.IO;
-using Microsoft.Xna.Framework.Graphics;
-using Color = Microsoft.Xna.Framework.Color;
+using Microsoft.Xna.Framework.Graphics;
 using System;
+using System.IO;
+using Color = Microsoft.Xna.Framework.Color;
 
 namespace Barotrauma
 {
diff --git a/Barotrauma/BarotraumaClient/Source/Utils/ToolBox.cs b/Barotrauma/BarotraumaClient/Source/Utils/ToolBox.cs
index 0937240c9..d2699c66e 100644
--- a/Barotrauma/BarotraumaClient/Source/Utils/ToolBox.cs
+++ b/Barotrauma/BarotraumaClient/Source/Utils/ToolBox.cs
@@ -1,13 +1,6 @@
-using Lidgren.Network;
-using Microsoft.Xna.Framework;
-using Microsoft.Xna.Framework.Graphics;
+using Microsoft.Xna.Framework;
 using System;
-using System.Globalization;
-using System.IO;
-using System.Linq;
 using System.Text;
-using System.Xml;
-using System.Xml.Linq;
 
 namespace Barotrauma
 {
diff --git a/Barotrauma/BarotraumaServer/Source/Camera.cs b/Barotrauma/BarotraumaServer/Source/Camera.cs
index 35d930cd5..1e21b40e6 100644
--- a/Barotrauma/BarotraumaServer/Source/Camera.cs
+++ b/Barotrauma/BarotraumaServer/Source/Camera.cs
@@ -1,6 +1,5 @@
-using System;
-using Microsoft.Xna.Framework;
-using System.Linq;
+using Microsoft.Xna.Framework;
+using System;
 //TODO: this class still does things that the server doesn't need, cleanup
 
 namespace Barotrauma
diff --git a/Barotrauma/BarotraumaServer/Source/Characters/Character.cs b/Barotrauma/BarotraumaServer/Source/Characters/Character.cs
index 58d517c7d..4f8953b5f 100644
--- a/Barotrauma/BarotraumaServer/Source/Characters/Character.cs
+++ b/Barotrauma/BarotraumaServer/Source/Characters/Character.cs
@@ -1,12 +1,5 @@
-using FarseerPhysics;
-using FarseerPhysics.Dynamics;
-using FarseerPhysics.Dynamics.Joints;
-using Barotrauma.Networking;
-using System;
-using System.Collections.Generic;
-using System.Linq;
+using Barotrauma.Networking;
 using System.Xml.Linq;
-using Microsoft.Xna.Framework;
 
 namespace Barotrauma
 {
diff --git a/Barotrauma/BarotraumaServer/Source/DebugConsole.cs b/Barotrauma/BarotraumaServer/Source/DebugConsole.cs
index f6b68b517..ec1df4a4d 100644
--- a/Barotrauma/BarotraumaServer/Source/DebugConsole.cs
+++ b/Barotrauma/BarotraumaServer/Source/DebugConsole.cs
@@ -1,8 +1,8 @@
-using System;
+using Barotrauma.Networking;
+using Microsoft.Xna.Framework;
+using System;
 using System.Collections.Generic;
 using System.Linq;
-using Microsoft.Xna.Framework;
-using Barotrauma.Networking;
 
 namespace Barotrauma
 {
diff --git a/Barotrauma/BarotraumaServer/Source/GameMain.cs b/Barotrauma/BarotraumaServer/Source/GameMain.cs
index 9d8f84cc0..3fa832d3d 100644
--- a/Barotrauma/BarotraumaServer/Source/GameMain.cs
+++ b/Barotrauma/BarotraumaServer/Source/GameMain.cs
@@ -1,11 +1,9 @@
-using System;
-using System.Diagnostics;
-using System.Reflection;
-using FarseerPhysics;
+using Barotrauma.Networking;
 using FarseerPhysics.Dynamics;
-using Barotrauma.Networking;
-using System.Collections.Generic;
 using Microsoft.Xna.Framework;
+using System;
+using System.Collections.Generic;
+using System.Reflection;
 using System.Threading;
 using System.Xml.Linq;
 
diff --git a/Barotrauma/BarotraumaServer/Source/GameSession/GameSession.cs b/Barotrauma/BarotraumaServer/Source/GameSession/GameSession.cs
index fd607435e..2806f50c1 100644
--- a/Barotrauma/BarotraumaServer/Source/GameSession/GameSession.cs
+++ b/Barotrauma/BarotraumaServer/Source/GameSession/GameSession.cs
@@ -1,9 +1,4 @@
-using System;
-using Microsoft.Xna.Framework;
-using Microsoft.Xna.Framework.Graphics;
-using System.Xml.Linq;
-
-namespace Barotrauma
+namespace Barotrauma
 {
     partial class GameSession
     {
diff --git a/Barotrauma/BarotraumaServer/Source/GameSettings.cs b/Barotrauma/BarotraumaServer/Source/GameSettings.cs
index ccbabfb26..3c2a9cac3 100644
--- a/Barotrauma/BarotraumaServer/Source/GameSettings.cs
+++ b/Barotrauma/BarotraumaServer/Source/GameSettings.cs
@@ -1,9 +1,4 @@
-using Microsoft.Xna.Framework;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Xml.Linq;
+using System.Xml.Linq;
 
 namespace Barotrauma
 {
diff --git a/Barotrauma/BarotraumaServer/Source/Items/Components/ItemComponent.cs b/Barotrauma/BarotraumaServer/Source/Items/Components/ItemComponent.cs
index 87844a6c6..959989f0a 100644
--- a/Barotrauma/BarotraumaServer/Source/Items/Components/ItemComponent.cs
+++ b/Barotrauma/BarotraumaServer/Source/Items/Components/ItemComponent.cs
@@ -1,13 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Reflection;
-using System.Xml.Linq;
-using Lidgren.Network;
-using Microsoft.Xna.Framework;
-using Microsoft.Xna.Framework.Graphics;
-using Barotrauma.Networking;
-using System.IO;
+using System.Xml.Linq;
 
 namespace Barotrauma.Items.Components
 {
diff --git a/Barotrauma/BarotraumaServer/Source/Items/Components/Machines/Steering.cs b/Barotrauma/BarotraumaServer/Source/Items/Components/Machines/Steering.cs
index bfc446b67..62a2b71d7 100644
--- a/Barotrauma/BarotraumaServer/Source/Items/Components/Machines/Steering.cs
+++ b/Barotrauma/BarotraumaServer/Source/Items/Components/Machines/Steering.cs
@@ -1,14 +1,4 @@
 using Barotrauma.Networking;
-using FarseerPhysics;
-using Microsoft.Xna.Framework;
-using Microsoft.Xna.Framework.Graphics;
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Linq;
-using System.Text;
-using System.Xml.Linq;
-using Voronoi2;
 
 namespace Barotrauma.Items.Components
 {
diff --git a/Barotrauma/BarotraumaServer/Source/Map/Hull.cs b/Barotrauma/BarotraumaServer/Source/Map/Hull.cs
index b8e392291..ef1e2d5f7 100644
--- a/Barotrauma/BarotraumaServer/Source/Map/Hull.cs
+++ b/Barotrauma/BarotraumaServer/Source/Map/Hull.cs
@@ -1,8 +1,5 @@
-using FarseerPhysics.Dynamics;
+using Barotrauma.Networking;
 using Microsoft.Xna.Framework;
-using Microsoft.Xna.Framework.Graphics;
-using Lidgren.Network;
-using Barotrauma.Networking;
 
 namespace Barotrauma
 {
diff --git a/Barotrauma/BarotraumaServer/Source/Networking/GameClient.cs b/Barotrauma/BarotraumaServer/Source/Networking/GameClient.cs
index 253738e8d..a62026d5f 100644
--- a/Barotrauma/BarotraumaServer/Source/Networking/GameClient.cs
+++ b/Barotrauma/BarotraumaServer/Source/Networking/GameClient.cs
@@ -1,11 +1,4 @@
 using System;
-using Lidgren.Network;
-using Microsoft.Xna.Framework;
-using System.Collections.Generic;
-using System.IO;
-using System.Text;
-using System.ComponentModel;
-using System.Linq;
 
 namespace Barotrauma.Networking
 {
diff --git a/Barotrauma/BarotraumaServer/Source/Networking/GameServer.cs b/Barotrauma/BarotraumaServer/Source/Networking/GameServer.cs
index bca8dad3c..afca15e8d 100644
--- a/Barotrauma/BarotraumaServer/Source/Networking/GameServer.cs
+++ b/Barotrauma/BarotraumaServer/Source/Networking/GameServer.cs
@@ -1,12 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-using System.Text;
-using Lidgren.Network;
-using Microsoft.Xna.Framework;
-using RestSharp;
-using Barotrauma.Items.Components;
+using Lidgren.Network;
 
 namespace Barotrauma.Networking
 {
diff --git a/Barotrauma/BarotraumaServer/Source/Networking/NetworkMember.cs b/Barotrauma/BarotraumaServer/Source/Networking/NetworkMember.cs
index 960fd2909..dddaff171 100644
--- a/Barotrauma/BarotraumaServer/Source/Networking/NetworkMember.cs
+++ b/Barotrauma/BarotraumaServer/Source/Networking/NetworkMember.cs
@@ -1,12 +1,4 @@
-using System;
-using System.Linq;
-using Microsoft.Xna.Framework;
-using Microsoft.Xna.Framework.Graphics;
-using System.Collections.Generic;
-using Lidgren.Network;
-using Barotrauma.Items.Components;
-
-namespace Barotrauma.Networking
+namespace Barotrauma.Networking
 {
     abstract partial class NetworkMember
     {
diff --git a/Barotrauma/BarotraumaServer/Source/Networking/Voting.cs b/Barotrauma/BarotraumaServer/Source/Networking/Voting.cs
index 9b64e7198..4fdc84c03 100644
--- a/Barotrauma/BarotraumaServer/Source/Networking/Voting.cs
+++ b/Barotrauma/BarotraumaServer/Source/Networking/Voting.cs
@@ -1,12 +1,4 @@
-using Barotrauma.Networking;
-using Lidgren.Network;
-using Microsoft.Xna.Framework;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace Barotrauma
+namespace Barotrauma
 {
     partial class Voting
     {
diff --git a/Barotrauma/BarotraumaServer/Source/Program.cs b/Barotrauma/BarotraumaServer/Source/Program.cs
index 46cf9171b..1cbe43ace 100644
--- a/Barotrauma/BarotraumaServer/Source/Program.cs
+++ b/Barotrauma/BarotraumaServer/Source/Program.cs
@@ -2,12 +2,10 @@
 
 using System;
 using System.IO;
-using System.Reflection;
 using System.Text;
 using System.Threading;
 
 #if WINDOWS
-using System.Management;
 #endif
 
 #endregion
diff --git a/Barotrauma/BarotraumaServer/Source/Screens/NetLobbyScreen.cs b/Barotrauma/BarotraumaServer/Source/Screens/NetLobbyScreen.cs
index 5b57c9d39..9b825bae0 100644
--- a/Barotrauma/BarotraumaServer/Source/Screens/NetLobbyScreen.cs
+++ b/Barotrauma/BarotraumaServer/Source/Screens/NetLobbyScreen.cs
@@ -1,11 +1,7 @@
-using System;
-using Microsoft.Xna.Framework;
-using Microsoft.Xna.Framework.Graphics;
-using Barotrauma.Networking;
-using System.Linq;
+using Microsoft.Xna.Framework;
+using System;
 using System.Collections.Generic;
-using System.Reflection;
-using System.ComponentModel;
+using System.Linq;
 
 namespace Barotrauma
 {
diff --git a/Barotrauma/BarotraumaServer/Source/Screens/UnimplementedScreen.cs b/Barotrauma/BarotraumaServer/Source/Screens/UnimplementedScreen.cs
index 0c00104da..50d47c655 100644
--- a/Barotrauma/BarotraumaServer/Source/Screens/UnimplementedScreen.cs
+++ b/Barotrauma/BarotraumaServer/Source/Screens/UnimplementedScreen.cs
@@ -1,11 +1,4 @@
 using System;
-using Microsoft.Xna.Framework;
-using Microsoft.Xna.Framework.Graphics;
-using Barotrauma.Networking;
-using System.Linq;
-using System.Collections.Generic;
-using System.Reflection;
-using System.ComponentModel;
 
 namespace Barotrauma
 {
diff --git a/Barotrauma/BarotraumaServer/Source/Utils/MonogameTypes/Color.cs b/Barotrauma/BarotraumaServer/Source/Utils/MonogameTypes/Color.cs
index 35d05167f..c92c9138a 100644
--- a/Barotrauma/BarotraumaServer/Source/Utils/MonogameTypes/Color.cs
+++ b/Barotrauma/BarotraumaServer/Source/Utils/MonogameTypes/Color.cs
@@ -6,16 +6,15 @@
 // available in Farseer's implementation of MathHelper.
 
 using System;
-using System.Text;
-using System.Runtime.Serialization;
 using System.Diagnostics;
+using System.Text;
 
 namespace Microsoft.Xna.Framework
 {
     /// <summary>
     /// Describes a 32-bit packed color.
     /// </summary>
-        [DebuggerDisplay("{DebugDisplayString,nq}")]
+    [DebuggerDisplay("{DebugDisplayString,nq}")]
     public struct Color : IEquatable<Color>
     {
         static Color()
diff --git a/Barotrauma/BarotraumaServer/Source/Utils/MonogameTypes/Input/KeyState.cs b/Barotrauma/BarotraumaServer/Source/Utils/MonogameTypes/Input/KeyState.cs
index 5bba7b39a..51529dca0 100644
--- a/Barotrauma/BarotraumaServer/Source/Utils/MonogameTypes/Input/KeyState.cs
+++ b/Barotrauma/BarotraumaServer/Source/Utils/MonogameTypes/Input/KeyState.cs
@@ -40,10 +40,10 @@
 
 namespace Microsoft.Xna.Framework.Input
 {
-	/// <summary>
-	/// Identifies the state of a keyboard key.
-	/// </summary>
-	public enum KeyState
+    /// <summary>
+    /// Identifies the state of a keyboard key.
+    /// </summary>
+    public enum KeyState
 	{
 		/// <summary>
 		/// Key is released.
diff --git a/Barotrauma/BarotraumaServer/Source/Utils/MonogameTypes/Point.cs b/Barotrauma/BarotraumaServer/Source/Utils/MonogameTypes/Point.cs
index 4ee354fb2..db63d3a77 100644
--- a/Barotrauma/BarotraumaServer/Source/Utils/MonogameTypes/Point.cs
+++ b/Barotrauma/BarotraumaServer/Source/Utils/MonogameTypes/Point.cs
@@ -4,7 +4,6 @@
 
 using System;
 using System.Diagnostics;
-using System.Runtime.Serialization;
 
 namespace Microsoft.Xna.Framework
 {
diff --git a/Barotrauma/BarotraumaServer/Source/Utils/MonogameTypes/Quaternion.cs b/Barotrauma/BarotraumaServer/Source/Utils/MonogameTypes/Quaternion.cs
index f758552e6..78babbab5 100644
--- a/Barotrauma/BarotraumaServer/Source/Utils/MonogameTypes/Quaternion.cs
+++ b/Barotrauma/BarotraumaServer/Source/Utils/MonogameTypes/Quaternion.cs
@@ -4,14 +4,13 @@
 
 using System;
 using System.Diagnostics;
-using System.Runtime.Serialization;
 
 namespace Microsoft.Xna.Framework
 {
     /// <summary>
     /// An efficient mathematical representation for three dimensional rotations.
     /// </summary>
-    
+
     [DebuggerDisplay("{DebugDisplayString,nq}")]
     public struct Quaternion : IEquatable<Quaternion>
     {
diff --git a/Barotrauma/BarotraumaServer/Source/Utils/MonogameTypes/Rectangle.cs b/Barotrauma/BarotraumaServer/Source/Utils/MonogameTypes/Rectangle.cs
index 469f51fc0..57ce68b56 100644
--- a/Barotrauma/BarotraumaServer/Source/Utils/MonogameTypes/Rectangle.cs
+++ b/Barotrauma/BarotraumaServer/Source/Utils/MonogameTypes/Rectangle.cs
@@ -3,7 +3,6 @@
 // file 'LICENSE.txt', which is part of this source code package.
 
 using System;
-using System.Runtime.Serialization;
 using System.Diagnostics;
 
 namespace Microsoft.Xna.Framework
@@ -11,7 +10,7 @@ namespace Microsoft.Xna.Framework
     /// <summary>
     /// Describes a 2D-rectangle. 
     /// </summary>
-    
+
     [DebuggerDisplay("{DebugDisplayString,nq}")]
     public struct Rectangle : IEquatable<Rectangle>
     {
diff --git a/Barotrauma/BarotraumaServer/Source/Utils/MonogameTypes/Vector4.cs b/Barotrauma/BarotraumaServer/Source/Utils/MonogameTypes/Vector4.cs
index 257829a34..66e64cf5d 100644
--- a/Barotrauma/BarotraumaServer/Source/Utils/MonogameTypes/Vector4.cs
+++ b/Barotrauma/BarotraumaServer/Source/Utils/MonogameTypes/Vector4.cs
@@ -6,7 +6,6 @@
 // available in Farseer's implementation of MathHelper.
 
 using System;
-using System.Runtime.Serialization;
 using System.Diagnostics;
 
 namespace Microsoft.Xna.Framework
@@ -17,7 +16,7 @@ namespace Microsoft.Xna.Framework
 #if XNADESIGNPROVIDED
     [System.ComponentModel.TypeConverter(typeof(Microsoft.Xna.Framework.Design.Vector4TypeConverter))]
 #endif
-        [DebuggerDisplay("{DebugDisplayString,nq}")]
+    [DebuggerDisplay("{DebugDisplayString,nq}")]
     public struct Vector4 : IEquatable<Vector4>
     {
         #region Private Fields
diff --git a/Barotrauma/BarotraumaShared/Source/Characters/AI/AIController.cs b/Barotrauma/BarotraumaShared/Source/Characters/AI/AIController.cs
index d3095f5a2..bcff43a03 100644
--- a/Barotrauma/BarotraumaShared/Source/Characters/AI/AIController.cs
+++ b/Barotrauma/BarotraumaShared/Source/Characters/AI/AIController.cs
@@ -1,6 +1,4 @@
-using Lidgren.Network;
-using Microsoft.Xna.Framework;
-using Microsoft.Xna.Framework.Graphics;
+using Microsoft.Xna.Framework;
 
 namespace Barotrauma
 {
diff --git a/Barotrauma/BarotraumaShared/Source/Characters/AI/AITarget.cs b/Barotrauma/BarotraumaShared/Source/Characters/AI/AITarget.cs
index 4939a9358..11c42b50d 100644
--- a/Barotrauma/BarotraumaShared/Source/Characters/AI/AITarget.cs
+++ b/Barotrauma/BarotraumaShared/Source/Characters/AI/AITarget.cs
@@ -1,7 +1,6 @@
-using System;
+using Microsoft.Xna.Framework;
+using System;
 using System.Collections.Generic;
-using Microsoft.Xna.Framework;
-using Microsoft.Xna.Framework.Graphics;
 
 namespace Barotrauma
 {
diff --git a/Barotrauma/BarotraumaShared/Source/Characters/AI/EnemyAIController.cs b/Barotrauma/BarotraumaShared/Source/Characters/AI/EnemyAIController.cs
index 85fa6b0e1..392a5f96d 100644
--- a/Barotrauma/BarotraumaShared/Source/Characters/AI/EnemyAIController.cs
+++ b/Barotrauma/BarotraumaShared/Source/Characters/AI/EnemyAIController.cs
@@ -1,10 +1,9 @@
-using System;
+using FarseerPhysics;
+using FarseerPhysics.Dynamics;
+using Microsoft.Xna.Framework;
+using System;
 using System.Collections.Generic;
 using System.Xml.Linq;
-using FarseerPhysics;
-using Microsoft.Xna.Framework;
-using FarseerPhysics.Dynamics;
-using Microsoft.Xna.Framework.Graphics;
 
 namespace Barotrauma
 {
diff --git a/Barotrauma/BarotraumaShared/Source/Characters/AI/IndoorsSteeringManager.cs b/Barotrauma/BarotraumaShared/Source/Characters/AI/IndoorsSteeringManager.cs
index b446539ad..da0f17861 100644
--- a/Barotrauma/BarotraumaShared/Source/Characters/AI/IndoorsSteeringManager.cs
+++ b/Barotrauma/BarotraumaShared/Source/Characters/AI/IndoorsSteeringManager.cs
@@ -1,7 +1,7 @@
-using System;
-using System.Linq;
+using Barotrauma.Items.Components;
 using Microsoft.Xna.Framework;
-using Barotrauma.Items.Components;
+using System;
+using System.Linq;
 
 namespace Barotrauma
 {
diff --git a/Barotrauma/BarotraumaShared/Source/Characters/AI/Objectives/AIObjective.cs b/Barotrauma/BarotraumaShared/Source/Characters/AI/Objectives/AIObjective.cs
index 86cafe575..ee6381c50 100644
--- a/Barotrauma/BarotraumaShared/Source/Characters/AI/Objectives/AIObjective.cs
+++ b/Barotrauma/BarotraumaShared/Source/Characters/AI/Objectives/AIObjective.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 
 namespace Barotrauma
 {
diff --git a/Barotrauma/BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveCombat.cs b/Barotrauma/BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveCombat.cs
index a64df2069..f73e03969 100644
--- a/Barotrauma/BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveCombat.cs
+++ b/Barotrauma/BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveCombat.cs
@@ -2,7 +2,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 
 namespace Barotrauma
 {
diff --git a/Barotrauma/BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveContainItem.cs b/Barotrauma/BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveContainItem.cs
index cad9038cc..b5b4181f5 100644
--- a/Barotrauma/BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveContainItem.cs
+++ b/Barotrauma/BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveContainItem.cs
@@ -1,9 +1,6 @@
 using Barotrauma.Items.Components;
 using Microsoft.Xna.Framework;
-using System;
-using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 
 namespace Barotrauma
 {
diff --git a/Barotrauma/BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveFindDivingGear.cs b/Barotrauma/BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveFindDivingGear.cs
index 3be281669..0b9928d66 100644
--- a/Barotrauma/BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveFindDivingGear.cs
+++ b/Barotrauma/BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveFindDivingGear.cs
@@ -1,8 +1,5 @@
 using Barotrauma.Items.Components;
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 
 namespace Barotrauma
 {
diff --git a/Barotrauma/BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveFixLeak.cs b/Barotrauma/BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveFixLeak.cs
index 2c8863d6f..46f3b6f86 100644
--- a/Barotrauma/BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveFixLeak.cs
+++ b/Barotrauma/BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveFixLeak.cs
@@ -2,9 +2,6 @@
 using FarseerPhysics;
 using Microsoft.Xna.Framework;
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 
 namespace Barotrauma
 {
diff --git a/Barotrauma/BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveFixLeaks.cs b/Barotrauma/BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveFixLeaks.cs
index ce4d97639..5b2d60795 100644
--- a/Barotrauma/BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveFixLeaks.cs
+++ b/Barotrauma/BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveFixLeaks.cs
@@ -1,5 +1,5 @@
-using System;
-using Microsoft.Xna.Framework;
+using Microsoft.Xna.Framework;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 
diff --git a/Barotrauma/BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveGetItem.cs b/Barotrauma/BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveGetItem.cs
index ab2ce3af0..25bb9893f 100644
--- a/Barotrauma/BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveGetItem.cs
+++ b/Barotrauma/BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveGetItem.cs
@@ -1,9 +1,7 @@
 using Barotrauma.Items.Components;
 using Microsoft.Xna.Framework;
-using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 
 namespace Barotrauma
 {
diff --git a/Barotrauma/BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveOperateItem.cs b/Barotrauma/BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveOperateItem.cs
index 443a0079e..4d38c43e3 100644
--- a/Barotrauma/BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveOperateItem.cs
+++ b/Barotrauma/BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveOperateItem.cs
@@ -1,9 +1,6 @@
 using Barotrauma.Items.Components;
 using Microsoft.Xna.Framework;
-using System;
-using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 
 namespace Barotrauma
 {
diff --git a/Barotrauma/BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveRescue.cs b/Barotrauma/BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveRescue.cs
index afb30c2d3..84f291d48 100644
--- a/Barotrauma/BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveRescue.cs
+++ b/Barotrauma/BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveRescue.cs
@@ -1,9 +1,5 @@
-using System;
-using System.Collections.Generic;
+using Microsoft.Xna.Framework;
 using System.Diagnostics;
-using System.Linq;
-using System.Text;
-using Microsoft.Xna.Framework;
 
 namespace Barotrauma
 {
diff --git a/Barotrauma/BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveRescueAll.cs b/Barotrauma/BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveRescueAll.cs
index a632cd62a..adeb631b9 100644
--- a/Barotrauma/BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveRescueAll.cs
+++ b/Barotrauma/BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveRescueAll.cs
@@ -1,7 +1,5 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 
 namespace Barotrauma
 {
diff --git a/Barotrauma/BarotraumaShared/Source/Characters/AI/Order.cs b/Barotrauma/BarotraumaShared/Source/Characters/AI/Order.cs
index 58efac592..78eaac0b8 100644
--- a/Barotrauma/BarotraumaShared/Source/Characters/AI/Order.cs
+++ b/Barotrauma/BarotraumaShared/Source/Characters/AI/Order.cs
@@ -3,8 +3,6 @@ using Microsoft.Xna.Framework;
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Linq;
-using System.Text;
 using System.Xml.Linq;
 
 namespace Barotrauma
diff --git a/Barotrauma/BarotraumaShared/Source/Characters/AI/SteeringManager.cs b/Barotrauma/BarotraumaShared/Source/Characters/AI/SteeringManager.cs
index 3de7c160e..910c8d8c2 100644
--- a/Barotrauma/BarotraumaShared/Source/Characters/AI/SteeringManager.cs
+++ b/Barotrauma/BarotraumaShared/Source/Characters/AI/SteeringManager.cs
@@ -1,6 +1,6 @@
-using System;
+using FarseerPhysics.Dynamics;
 using Microsoft.Xna.Framework;
-using FarseerPhysics.Dynamics;
+using System;
 
 namespace Barotrauma
 {
diff --git a/Barotrauma/BarotraumaShared/Source/Characters/AI/SteeringPath.cs b/Barotrauma/BarotraumaShared/Source/Characters/AI/SteeringPath.cs
index 9229c08a9..86fbdfc8d 100644
--- a/Barotrauma/BarotraumaShared/Source/Characters/AI/SteeringPath.cs
+++ b/Barotrauma/BarotraumaShared/Source/Characters/AI/SteeringPath.cs
@@ -1,5 +1,5 @@
-using System.Collections.Generic;
-using Microsoft.Xna.Framework;
+using Microsoft.Xna.Framework;
+using System.Collections.Generic;
 
 namespace Barotrauma
 {
diff --git a/Barotrauma/BarotraumaShared/Source/Characters/Animation/AnimController.cs b/Barotrauma/BarotraumaShared/Source/Characters/Animation/AnimController.cs
index b7e03d710..dd41f4d55 100644
--- a/Barotrauma/BarotraumaShared/Source/Characters/Animation/AnimController.cs
+++ b/Barotrauma/BarotraumaShared/Source/Characters/Animation/AnimController.cs
@@ -1,7 +1,6 @@
-using System.Xml.Linq;
-using FarseerPhysics;
+using FarseerPhysics;
 using Microsoft.Xna.Framework;
-using System.Collections.Generic;
+using System.Xml.Linq;
 
 namespace Barotrauma
 {
diff --git a/Barotrauma/BarotraumaShared/Source/Characters/Animation/FishAnimController.cs b/Barotrauma/BarotraumaShared/Source/Characters/Animation/FishAnimController.cs
index df3711b26..ee9714d70 100644
--- a/Barotrauma/BarotraumaShared/Source/Characters/Animation/FishAnimController.cs
+++ b/Barotrauma/BarotraumaShared/Source/Characters/Animation/FishAnimController.cs
@@ -1,9 +1,8 @@
-using System;
-using System.Linq;
-using System.Xml.Linq;
-using FarseerPhysics;
+using FarseerPhysics;
 using FarseerPhysics.Dynamics.Joints;
 using Microsoft.Xna.Framework;
+using System;
+using System.Xml.Linq;
 
 namespace Barotrauma
 {
diff --git a/Barotrauma/BarotraumaShared/Source/Characters/Animation/HumanoidAnimController.cs b/Barotrauma/BarotraumaShared/Source/Characters/Animation/HumanoidAnimController.cs
index c126eaa2b..da624985c 100644
--- a/Barotrauma/BarotraumaShared/Source/Characters/Animation/HumanoidAnimController.cs
+++ b/Barotrauma/BarotraumaShared/Source/Characters/Animation/HumanoidAnimController.cs
@@ -1,9 +1,9 @@
-using System;
-using System.Linq;
-using System.Xml.Linq;
+using Barotrauma.Items.Components;
 using FarseerPhysics;
 using Microsoft.Xna.Framework;
-using Barotrauma.Items.Components;
+using System;
+using System.Linq;
+using System.Xml.Linq;
 
 namespace Barotrauma
 {
diff --git a/Barotrauma/BarotraumaShared/Source/Characters/Animation/Ragdoll.cs b/Barotrauma/BarotraumaShared/Source/Characters/Animation/Ragdoll.cs
index f513a4a5d..6cae2ce14 100644
--- a/Barotrauma/BarotraumaShared/Source/Characters/Animation/Ragdoll.cs
+++ b/Barotrauma/BarotraumaShared/Source/Characters/Animation/Ragdoll.cs
@@ -1,13 +1,12 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Xml.Linq;
-using FarseerPhysics;
+using FarseerPhysics;
 using FarseerPhysics.Dynamics;
 using FarseerPhysics.Dynamics.Contacts;
 using FarseerPhysics.Dynamics.Joints;
 using Microsoft.Xna.Framework;
-using Microsoft.Xna.Framework.Graphics;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Xml.Linq;
 
 namespace Barotrauma
 {
diff --git a/Barotrauma/BarotraumaShared/Source/Characters/Attack.cs b/Barotrauma/BarotraumaShared/Source/Characters/Attack.cs
index a6731a3af..73c906e60 100644
--- a/Barotrauma/BarotraumaShared/Source/Characters/Attack.cs
+++ b/Barotrauma/BarotraumaShared/Source/Characters/Attack.cs
@@ -1,7 +1,7 @@
 using Microsoft.Xna.Framework;
 using System;
-using System.Xml.Linq;
 using System.Collections.Generic;
+using System.Xml.Linq;
 
 
 namespace Barotrauma
diff --git a/Barotrauma/BarotraumaShared/Source/Characters/Character.cs b/Barotrauma/BarotraumaShared/Source/Characters/Character.cs
index 3f6b0cf93..4fdf151fb 100644
--- a/Barotrauma/BarotraumaShared/Source/Characters/Character.cs
+++ b/Barotrauma/BarotraumaShared/Source/Characters/Character.cs
@@ -1,12 +1,11 @@
-using FarseerPhysics;
-using FarseerPhysics.Dynamics;
+using Barotrauma.Networking;
+using FarseerPhysics;
 using FarseerPhysics.Dynamics.Joints;
-using Barotrauma.Networking;
+using Microsoft.Xna.Framework;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Xml.Linq;
-using Microsoft.Xna.Framework;
 
 namespace Barotrauma
 {
diff --git a/Barotrauma/BarotraumaShared/Source/Characters/HuskInfection.cs b/Barotrauma/BarotraumaShared/Source/Characters/HuskInfection.cs
index 859f9f97c..84dbf9eff 100644
--- a/Barotrauma/BarotraumaShared/Source/Characters/HuskInfection.cs
+++ b/Barotrauma/BarotraumaShared/Source/Characters/HuskInfection.cs
@@ -1,10 +1,5 @@
 using Microsoft.Xna.Framework;
-using System;
-using System.Collections.Generic;
 using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Xml.Linq;
 
 namespace Barotrauma
diff --git a/Barotrauma/BarotraumaShared/Source/Characters/Jobs/JobPrefab.cs b/Barotrauma/BarotraumaShared/Source/Characters/Jobs/JobPrefab.cs
index ef2bb924a..cd914191a 100644
--- a/Barotrauma/BarotraumaShared/Source/Characters/Jobs/JobPrefab.cs
+++ b/Barotrauma/BarotraumaShared/Source/Characters/Jobs/JobPrefab.cs
@@ -1,8 +1,5 @@
-using Microsoft.Xna.Framework;
-using System.Collections.Generic;
-using System.Globalization;
+using System.Collections.Generic;
 using System.Xml.Linq;
-using System.Linq;
 
 namespace Barotrauma
 {
diff --git a/Barotrauma/BarotraumaShared/Source/Characters/Limb.cs b/Barotrauma/BarotraumaShared/Source/Characters/Limb.cs
index 49cc2cdd5..cec973422 100644
--- a/Barotrauma/BarotraumaShared/Source/Characters/Limb.cs
+++ b/Barotrauma/BarotraumaShared/Source/Characters/Limb.cs
@@ -1,14 +1,14 @@
-using System;
-using System.Xml.Linq;
+//using Microsoft.Xna.Framework.Graphics;
+using Barotrauma.Items.Components;
 using FarseerPhysics;
 using FarseerPhysics.Dynamics;
 using FarseerPhysics.Dynamics.Joints;
 using Microsoft.Xna.Framework;
-//using Microsoft.Xna.Framework.Graphics;
-using Barotrauma.Items.Components;
+using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.IO;
+using System.Linq;
+using System.Xml.Linq;
 
 namespace Barotrauma
 {
diff --git a/Barotrauma/BarotraumaShared/Source/ContentPackage.cs b/Barotrauma/BarotraumaShared/Source/ContentPackage.cs
index 20d6d4995..c52e4d835 100644
--- a/Barotrauma/BarotraumaShared/Source/ContentPackage.cs
+++ b/Barotrauma/BarotraumaShared/Source/ContentPackage.cs
@@ -1,9 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Linq;
 using System.Security.Cryptography;
-using System.Text;
 using System.Xml.Linq;
 
 namespace Barotrauma
diff --git a/Barotrauma/BarotraumaShared/Source/DebugConsole.cs b/Barotrauma/BarotraumaShared/Source/DebugConsole.cs
index 34d26eed2..820ee0ef9 100644
--- a/Barotrauma/BarotraumaShared/Source/DebugConsole.cs
+++ b/Barotrauma/BarotraumaShared/Source/DebugConsole.cs
@@ -1,12 +1,10 @@
-using System;
+using Barotrauma.Items.Components;
+using Barotrauma.Networking;
+using FarseerPhysics;
+using Microsoft.Xna.Framework;
+using System;
 using System.Collections.Generic;
 using System.Linq;
-using Microsoft.Xna.Framework;
-using Microsoft.Xna.Framework.Graphics;
-using Barotrauma.Networking;
-using Barotrauma.Items.Components;
-using System.Text;
-using FarseerPhysics;
 
 namespace Barotrauma
 {
diff --git a/Barotrauma/BarotraumaShared/Source/Events/Missions/CargoMission.cs b/Barotrauma/BarotraumaShared/Source/Events/Missions/CargoMission.cs
index 839f09298..b0b35577a 100644
--- a/Barotrauma/BarotraumaShared/Source/Events/Missions/CargoMission.cs
+++ b/Barotrauma/BarotraumaShared/Source/Events/Missions/CargoMission.cs
@@ -1,9 +1,6 @@
-using Barotrauma.Items.Components;
-using Microsoft.Xna.Framework;
-using System;
+using Microsoft.Xna.Framework;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using System.Xml.Linq;
 
 namespace Barotrauma
diff --git a/Barotrauma/BarotraumaShared/Source/Events/Missions/CombatMission.cs b/Barotrauma/BarotraumaShared/Source/Events/Missions/CombatMission.cs
index d93312c21..740770b3b 100644
--- a/Barotrauma/BarotraumaShared/Source/Events/Missions/CombatMission.cs
+++ b/Barotrauma/BarotraumaShared/Source/Events/Missions/CombatMission.cs
@@ -1,8 +1,7 @@
 using Barotrauma.Networking;
 using Microsoft.Xna.Framework;
-using System;
-using System.Linq;
 using System.Collections.Generic;
+using System.Linq;
 using System.Xml.Linq;
 
 namespace Barotrauma
diff --git a/Barotrauma/BarotraumaShared/Source/Events/Missions/Mission.cs b/Barotrauma/BarotraumaShared/Source/Events/Missions/Mission.cs
index e1a409358..573ab3ad9 100644
--- a/Barotrauma/BarotraumaShared/Source/Events/Missions/Mission.cs
+++ b/Barotrauma/BarotraumaShared/Source/Events/Missions/Mission.cs
@@ -1,5 +1,4 @@
-using Barotrauma.Networking;
-using Microsoft.Xna.Framework;
+using Microsoft.Xna.Framework;
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/Barotrauma/BarotraumaShared/Source/Events/Missions/MonsterMission.cs b/Barotrauma/BarotraumaShared/Source/Events/Missions/MonsterMission.cs
index 5555aa68f..1e693717e 100644
--- a/Barotrauma/BarotraumaShared/Source/Events/Missions/MonsterMission.cs
+++ b/Barotrauma/BarotraumaShared/Source/Events/Missions/MonsterMission.cs
@@ -1,6 +1,4 @@
-using Barotrauma.Networking;
-using Microsoft.Xna.Framework;
-using System;
+using Microsoft.Xna.Framework;
 using System.Xml.Linq;
 
 namespace Barotrauma
diff --git a/Barotrauma/BarotraumaShared/Source/Events/Missions/SalvageMission.cs b/Barotrauma/BarotraumaShared/Source/Events/Missions/SalvageMission.cs
index 8adc61b00..7dc39c337 100644
--- a/Barotrauma/BarotraumaShared/Source/Events/Missions/SalvageMission.cs
+++ b/Barotrauma/BarotraumaShared/Source/Events/Missions/SalvageMission.cs
@@ -1,9 +1,6 @@
 using FarseerPhysics;
 using Microsoft.Xna.Framework;
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.Xml.Linq;
 
 namespace Barotrauma
diff --git a/Barotrauma/BarotraumaShared/Source/Events/MonsterEvent.cs b/Barotrauma/BarotraumaShared/Source/Events/MonsterEvent.cs
index 5670ba620..20bbf4e43 100644
--- a/Barotrauma/BarotraumaShared/Source/Events/MonsterEvent.cs
+++ b/Barotrauma/BarotraumaShared/Source/Events/MonsterEvent.cs
@@ -1,8 +1,8 @@
-using System.Xml.Linq;
-using Microsoft.Xna.Framework;
+using Microsoft.Xna.Framework;
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Xml.Linq;
 
 namespace Barotrauma
 {
diff --git a/Barotrauma/BarotraumaShared/Source/Events/TaskManager.cs b/Barotrauma/BarotraumaShared/Source/Events/TaskManager.cs
index 44728cf99..727f1cbbf 100644
--- a/Barotrauma/BarotraumaShared/Source/Events/TaskManager.cs
+++ b/Barotrauma/BarotraumaShared/Source/Events/TaskManager.cs
@@ -1,5 +1,4 @@
 using System.Collections.Generic;
-using System;
 using System.Linq;
 
 namespace Barotrauma
diff --git a/Barotrauma/BarotraumaShared/Source/FrameCounter.cs b/Barotrauma/BarotraumaShared/Source/FrameCounter.cs
index 11b400a5b..d41568fd6 100644
--- a/Barotrauma/BarotraumaShared/Source/FrameCounter.cs
+++ b/Barotrauma/BarotraumaShared/Source/FrameCounter.cs
@@ -3,7 +3,7 @@ using System.Linq;
 
 namespace Barotrauma
 {
-        public class FrameCounter
+    public class FrameCounter
         {
             public long TotalFrames { get; private set; }
             public double TotalSeconds { get; private set; }
diff --git a/Barotrauma/BarotraumaShared/Source/GameSession/GameModes/GameMode.cs b/Barotrauma/BarotraumaShared/Source/GameSession/GameModes/GameMode.cs
index 5803458d2..bbc151774 100644
--- a/Barotrauma/BarotraumaShared/Source/GameSession/GameModes/GameMode.cs
+++ b/Barotrauma/BarotraumaShared/Source/GameSession/GameModes/GameMode.cs
@@ -1,5 +1,4 @@
-using Microsoft.Xna.Framework.Graphics;
-using System;
+using System;
 using System.Collections.Generic;
 
 namespace Barotrauma
diff --git a/Barotrauma/BarotraumaShared/Source/GameSession/GameModes/GameModePreset.cs b/Barotrauma/BarotraumaShared/Source/GameSession/GameModes/GameModePreset.cs
index 6cd2b8897..f3d054beb 100644
--- a/Barotrauma/BarotraumaShared/Source/GameSession/GameModes/GameModePreset.cs
+++ b/Barotrauma/BarotraumaShared/Source/GameSession/GameModes/GameModePreset.cs
@@ -1,8 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Reflection;
-using System.Text;
 
 namespace Barotrauma
 {
diff --git a/Barotrauma/BarotraumaShared/Source/GameSession/GameModes/MissionMode.cs b/Barotrauma/BarotraumaShared/Source/GameSession/GameModes/MissionMode.cs
index dcdb014b7..77a49fbc3 100644
--- a/Barotrauma/BarotraumaShared/Source/GameSession/GameModes/MissionMode.cs
+++ b/Barotrauma/BarotraumaShared/Source/GameSession/GameModes/MissionMode.cs
@@ -1,6 +1,4 @@
-using Microsoft.Xna.Framework;
-
-namespace Barotrauma
+namespace Barotrauma
 {
     partial class MissionMode : GameMode
     {
diff --git a/Barotrauma/BarotraumaShared/Source/GameSession/GameSession.cs b/Barotrauma/BarotraumaShared/Source/GameSession/GameSession.cs
index d5bbc2bd8..264e5f456 100644
--- a/Barotrauma/BarotraumaShared/Source/GameSession/GameSession.cs
+++ b/Barotrauma/BarotraumaShared/Source/GameSession/GameSession.cs
@@ -1,6 +1,4 @@
-using System;
-using Microsoft.Xna.Framework;
-using Microsoft.Xna.Framework.Graphics;
+using Microsoft.Xna.Framework;
 using System.Xml.Linq;
 
 namespace Barotrauma
diff --git a/Barotrauma/BarotraumaShared/Source/GameSettings.cs b/Barotrauma/BarotraumaShared/Source/GameSettings.cs
index d87980261..ee3aca781 100644
--- a/Barotrauma/BarotraumaShared/Source/GameSettings.cs
+++ b/Barotrauma/BarotraumaShared/Source/GameSettings.cs
@@ -1,13 +1,9 @@
-using Microsoft.Xna.Framework;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+using System.Linq;
 using System.Xml.Linq;
 
 namespace Barotrauma
 {
-    
+
     public partial class GameSettings
     {
         
diff --git a/Barotrauma/BarotraumaShared/Source/Items/CharacterInventory.cs b/Barotrauma/BarotraumaShared/Source/Items/CharacterInventory.cs
index 5d3372b7b..672b78140 100644
--- a/Barotrauma/BarotraumaShared/Source/Items/CharacterInventory.cs
+++ b/Barotrauma/BarotraumaShared/Source/Items/CharacterInventory.cs
@@ -1,11 +1,9 @@
-using System;
-using System.Linq;
-using Microsoft.Xna.Framework;
-using Microsoft.Xna.Framework.Graphics;
+using Barotrauma.Items.Components;
 using Barotrauma.Networking;
-using Lidgren.Network;
+using Microsoft.Xna.Framework;
+using System;
 using System.Collections.Generic;
-using Barotrauma.Items.Components;
+using System.Linq;
 
 namespace Barotrauma
 {
diff --git a/Barotrauma/BarotraumaShared/Source/Items/Components/DockingPort.cs b/Barotrauma/BarotraumaShared/Source/Items/Components/DockingPort.cs
index 88c426fce..ff7ff5f5f 100644
--- a/Barotrauma/BarotraumaShared/Source/Items/Components/DockingPort.cs
+++ b/Barotrauma/BarotraumaShared/Source/Items/Components/DockingPort.cs
@@ -4,13 +4,10 @@ using FarseerPhysics.Dynamics;
 using FarseerPhysics.Dynamics.Joints;
 using FarseerPhysics.Factories;
 using Microsoft.Xna.Framework;
-using Microsoft.Xna.Framework.Graphics;
 using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Xml.Linq;
 
 namespace Barotrauma.Items.Components
diff --git a/Barotrauma/BarotraumaShared/Source/Items/Components/Door.cs b/Barotrauma/BarotraumaShared/Source/Items/Components/Door.cs
index c1b64fdc3..f243daa28 100644
--- a/Barotrauma/BarotraumaShared/Source/Items/Components/Door.cs
+++ b/Barotrauma/BarotraumaShared/Source/Items/Components/Door.cs
@@ -2,7 +2,6 @@
 using FarseerPhysics;
 using FarseerPhysics.Dynamics;
 using Microsoft.Xna.Framework;
-using Microsoft.Xna.Framework.Graphics;
 using System;
 using System.Collections.Generic;
 using System.IO;
diff --git a/Barotrauma/BarotraumaShared/Source/Items/Components/Holdable/Holdable.cs b/Barotrauma/BarotraumaShared/Source/Items/Components/Holdable/Holdable.cs
index e32101497..3e78b8fb9 100644
--- a/Barotrauma/BarotraumaShared/Source/Items/Components/Holdable/Holdable.cs
+++ b/Barotrauma/BarotraumaShared/Source/Items/Components/Holdable/Holdable.cs
@@ -1,9 +1,8 @@
-using System.Xml.Linq;
+using Barotrauma.Networking;
 using FarseerPhysics;
-using Microsoft.Xna.Framework;
-using System.Collections.Generic;
-using Barotrauma.Networking;
 using Lidgren.Network;
+using Microsoft.Xna.Framework;
+using System.Xml.Linq;
 
 namespace Barotrauma.Items.Components
 {
diff --git a/Barotrauma/BarotraumaShared/Source/Items/Components/Holdable/Pickable.cs b/Barotrauma/BarotraumaShared/Source/Items/Components/Holdable/Pickable.cs
index a98b76cbe..0ccabcb08 100644
--- a/Barotrauma/BarotraumaShared/Source/Items/Components/Holdable/Pickable.cs
+++ b/Barotrauma/BarotraumaShared/Source/Items/Components/Holdable/Pickable.cs
@@ -1,6 +1,4 @@
-using Barotrauma.Networking;
-using Microsoft.Xna.Framework;
-using Microsoft.Xna.Framework.Graphics;
+using Microsoft.Xna.Framework;
 using System;
 using System.Collections.Generic;
 using System.Xml.Linq;
diff --git a/Barotrauma/BarotraumaShared/Source/Items/Components/Holdable/RangedWeapon.cs b/Barotrauma/BarotraumaShared/Source/Items/Components/Holdable/RangedWeapon.cs
index de93cab60..b7885799f 100644
--- a/Barotrauma/BarotraumaShared/Source/Items/Components/Holdable/RangedWeapon.cs
+++ b/Barotrauma/BarotraumaShared/Source/Items/Components/Holdable/RangedWeapon.cs
@@ -1,10 +1,9 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Xml.Linq;
-using FarseerPhysics;
+using FarseerPhysics;
 using FarseerPhysics.Dynamics;
 using Microsoft.Xna.Framework;
+using System;
+using System.Collections.Generic;
+using System.Xml.Linq;
 
 namespace Barotrauma.Items.Components
 {
diff --git a/Barotrauma/BarotraumaShared/Source/Items/Components/Holdable/RepairTool.cs b/Barotrauma/BarotraumaShared/Source/Items/Components/Holdable/RepairTool.cs
index 18b82fc19..998be9294 100644
--- a/Barotrauma/BarotraumaShared/Source/Items/Components/Holdable/RepairTool.cs
+++ b/Barotrauma/BarotraumaShared/Source/Items/Components/Holdable/RepairTool.cs
@@ -1,10 +1,9 @@
-using System;
-using System.Collections.Generic;
-using System.Xml.Linq;
-using FarseerPhysics;
+using FarseerPhysics;
 using FarseerPhysics.Dynamics;
 using Microsoft.Xna.Framework;
-using Microsoft.Xna.Framework.Graphics;
+using System;
+using System.Collections.Generic;
+using System.Xml.Linq;
 
 namespace Barotrauma.Items.Components
 {
diff --git a/Barotrauma/BarotraumaShared/Source/Items/Components/ItemComponent.cs b/Barotrauma/BarotraumaShared/Source/Items/Components/ItemComponent.cs
index da0e36187..5e7508af3 100644
--- a/Barotrauma/BarotraumaShared/Source/Items/Components/ItemComponent.cs
+++ b/Barotrauma/BarotraumaShared/Source/Items/Components/ItemComponent.cs
@@ -1,13 +1,10 @@
-using System;
+using Microsoft.Xna.Framework;
+using Microsoft.Xna.Framework.Graphics;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
 using System.Xml.Linq;
-using Lidgren.Network;
-using Microsoft.Xna.Framework;
-using Microsoft.Xna.Framework.Graphics;
-using Barotrauma.Networking;
-using System.IO;
 
 namespace Barotrauma.Items.Components
 {
diff --git a/Barotrauma/BarotraumaShared/Source/Items/Components/ItemContainer.cs b/Barotrauma/BarotraumaShared/Source/Items/Components/ItemContainer.cs
index d883a1d1f..e5786602f 100644
--- a/Barotrauma/BarotraumaShared/Source/Items/Components/ItemContainer.cs
+++ b/Barotrauma/BarotraumaShared/Source/Items/Components/ItemContainer.cs
@@ -1,10 +1,8 @@
-using System;
+using Microsoft.Xna.Framework;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Xml.Linq;
-using FarseerPhysics;
-using Microsoft.Xna.Framework;
-using Microsoft.Xna.Framework.Graphics;
 
 namespace Barotrauma.Items.Components
 {
diff --git a/Barotrauma/BarotraumaShared/Source/Items/Components/ItemLabel.cs b/Barotrauma/BarotraumaShared/Source/Items/Components/ItemLabel.cs
index f6a08169a..1e92b7dd0 100644
--- a/Barotrauma/BarotraumaShared/Source/Items/Components/ItemLabel.cs
+++ b/Barotrauma/BarotraumaShared/Source/Items/Components/ItemLabel.cs
@@ -1,6 +1,4 @@
-using Microsoft.Xna.Framework;
-
-namespace Barotrauma.Items.Components
+namespace Barotrauma.Items.Components
 {
     partial class ItemLabel : ItemComponent, IDrawableComponent
     {
diff --git a/Barotrauma/BarotraumaShared/Source/Items/Components/Machines/Controller.cs b/Barotrauma/BarotraumaShared/Source/Items/Components/Machines/Controller.cs
index 232712cb5..2c422f27e 100644
--- a/Barotrauma/BarotraumaShared/Source/Items/Components/Machines/Controller.cs
+++ b/Barotrauma/BarotraumaShared/Source/Items/Components/Machines/Controller.cs
@@ -1,9 +1,8 @@
-using System;
+using FarseerPhysics;
+using Microsoft.Xna.Framework;
+using System;
 using System.Collections.Generic;
 using System.Xml.Linq;
-using FarseerPhysics;
-using FarseerPhysics.Dynamics.Joints;
-using Microsoft.Xna.Framework;
 
 namespace Barotrauma.Items.Components
 {
diff --git a/Barotrauma/BarotraumaShared/Source/Items/Components/Machines/Deconstructor.cs b/Barotrauma/BarotraumaShared/Source/Items/Components/Machines/Deconstructor.cs
index 6a9c1ff5b..84677d23d 100644
--- a/Barotrauma/BarotraumaShared/Source/Items/Components/Machines/Deconstructor.cs
+++ b/Barotrauma/BarotraumaShared/Source/Items/Components/Machines/Deconstructor.cs
@@ -1,11 +1,8 @@
 using Barotrauma.Networking;
 using Lidgren.Network;
 using Microsoft.Xna.Framework;
-using Microsoft.Xna.Framework.Graphics;
 using System;
-using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using System.Xml.Linq;
 
 namespace Barotrauma.Items.Components
diff --git a/Barotrauma/BarotraumaShared/Source/Items/Components/Machines/Engine.cs b/Barotrauma/BarotraumaShared/Source/Items/Components/Machines/Engine.cs
index d56d74af5..624ef4509 100644
--- a/Barotrauma/BarotraumaShared/Source/Items/Components/Machines/Engine.cs
+++ b/Barotrauma/BarotraumaShared/Source/Items/Components/Machines/Engine.cs
@@ -1,10 +1,6 @@
 using Microsoft.Xna.Framework;
-using Microsoft.Xna.Framework.Graphics;
 using System;
-using System.Collections.Generic;
 using System.Globalization;
-using System.Linq;
-using System.Text;
 using System.Xml.Linq;
 
 namespace Barotrauma.Items.Components
diff --git a/Barotrauma/BarotraumaShared/Source/Items/Components/Machines/Fabricator.cs b/Barotrauma/BarotraumaShared/Source/Items/Components/Machines/Fabricator.cs
index a98209b57..377ac89c3 100644
--- a/Barotrauma/BarotraumaShared/Source/Items/Components/Machines/Fabricator.cs
+++ b/Barotrauma/BarotraumaShared/Source/Items/Components/Machines/Fabricator.cs
@@ -1,11 +1,9 @@
 using Barotrauma.Networking;
 using Lidgren.Network;
 using Microsoft.Xna.Framework;
-using Microsoft.Xna.Framework.Graphics;
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using System.Xml.Linq;
 
 namespace Barotrauma.Items.Components
diff --git a/Barotrauma/BarotraumaShared/Source/Items/Components/Machines/MiniMap.cs b/Barotrauma/BarotraumaShared/Source/Items/Components/Machines/MiniMap.cs
index 820fa590c..e7eb33697 100644
--- a/Barotrauma/BarotraumaShared/Source/Items/Components/Machines/MiniMap.cs
+++ b/Barotrauma/BarotraumaShared/Source/Items/Components/Machines/MiniMap.cs
@@ -1,9 +1,6 @@
 using System;
-using System.Xml.Linq;
-using Microsoft.Xna.Framework;
-using Microsoft.Xna.Framework.Graphics;
 using System.Collections.Generic;
-using System.Linq;
+using System.Xml.Linq;
 
 namespace Barotrauma.Items.Components
 {
diff --git a/Barotrauma/BarotraumaShared/Source/Items/Components/Machines/OxygenGenerator.cs b/Barotrauma/BarotraumaShared/Source/Items/Components/Machines/OxygenGenerator.cs
index ef049a8d6..4fb394973 100644
--- a/Barotrauma/BarotraumaShared/Source/Items/Components/Machines/OxygenGenerator.cs
+++ b/Barotrauma/BarotraumaShared/Source/Items/Components/Machines/OxygenGenerator.cs
@@ -1,8 +1,8 @@
 using Microsoft.Xna.Framework;
 using System;
 using System.Collections.Generic;
-using System.Xml.Linq;
 using System.Linq;
+using System.Xml.Linq;
 
 namespace Barotrauma.Items.Components
 {
diff --git a/Barotrauma/BarotraumaShared/Source/Items/Components/Machines/Pump.cs b/Barotrauma/BarotraumaShared/Source/Items/Components/Machines/Pump.cs
index 53813ce67..b8901debb 100644
--- a/Barotrauma/BarotraumaShared/Source/Items/Components/Machines/Pump.cs
+++ b/Barotrauma/BarotraumaShared/Source/Items/Components/Machines/Pump.cs
@@ -1,8 +1,6 @@
 using Barotrauma.Networking;
 using Microsoft.Xna.Framework;
-using Microsoft.Xna.Framework.Graphics;
 using System;
-using System.Collections.Specialized;
 using System.Globalization;
 using System.Xml.Linq;
 
diff --git a/Barotrauma/BarotraumaShared/Source/Items/Components/Machines/Radar.cs b/Barotrauma/BarotraumaShared/Source/Items/Components/Machines/Radar.cs
index 4e5f7a81e..f31ccd97d 100644
--- a/Barotrauma/BarotraumaShared/Source/Items/Components/Machines/Radar.cs
+++ b/Barotrauma/BarotraumaShared/Source/Items/Components/Machines/Radar.cs
@@ -1,11 +1,8 @@
 using Barotrauma.Networking;
-using FarseerPhysics;
 using Microsoft.Xna.Framework;
-using Microsoft.Xna.Framework.Graphics;
 using System;
 using System.Collections.Generic;
 using System.Xml.Linq;
-using Voronoi2;
 
 namespace Barotrauma.Items.Components
 {
diff --git a/Barotrauma/BarotraumaShared/Source/Items/Components/Machines/Reactor.cs b/Barotrauma/BarotraumaShared/Source/Items/Components/Machines/Reactor.cs
index c9de27add..fccaf60f9 100644
--- a/Barotrauma/BarotraumaShared/Source/Items/Components/Machines/Reactor.cs
+++ b/Barotrauma/BarotraumaShared/Source/Items/Components/Machines/Reactor.cs
@@ -1,10 +1,9 @@
-using System;
-using System.Collections.Generic;
-using System.Xml.Linq;
+using Barotrauma.Networking;
 using Lidgren.Network;
 using Microsoft.Xna.Framework;
-using Microsoft.Xna.Framework.Graphics;
-using Barotrauma.Networking;
+using System;
+using System.Collections.Generic;
+using System.Xml.Linq;
 
 namespace Barotrauma.Items.Components
 {
diff --git a/Barotrauma/BarotraumaShared/Source/Items/Components/Machines/Steering.cs b/Barotrauma/BarotraumaShared/Source/Items/Components/Machines/Steering.cs
index 77d28cc5c..5d226a275 100644
--- a/Barotrauma/BarotraumaShared/Source/Items/Components/Machines/Steering.cs
+++ b/Barotrauma/BarotraumaShared/Source/Items/Components/Machines/Steering.cs
@@ -1,12 +1,8 @@
 using Barotrauma.Networking;
 using FarseerPhysics;
 using Microsoft.Xna.Framework;
-using Microsoft.Xna.Framework.Graphics;
 using System;
-using System.Collections.Generic;
 using System.Globalization;
-using System.Linq;
-using System.Text;
 using System.Xml.Linq;
 using Voronoi2;
 
diff --git a/Barotrauma/BarotraumaShared/Source/Items/Components/Power/PowerContainer.cs b/Barotrauma/BarotraumaShared/Source/Items/Components/Power/PowerContainer.cs
index 0e921f05b..517b2b8d0 100644
--- a/Barotrauma/BarotraumaShared/Source/Items/Components/Power/PowerContainer.cs
+++ b/Barotrauma/BarotraumaShared/Source/Items/Components/Power/PowerContainer.cs
@@ -1,9 +1,8 @@
-using System;
-using System.Xml.Linq;
-using Microsoft.Xna.Framework;
-using Microsoft.Xna.Framework.Graphics;
-using Barotrauma.Networking;
+using Barotrauma.Networking;
 using Lidgren.Network;
+using Microsoft.Xna.Framework;
+using System;
+using System.Xml.Linq;
 
 namespace Barotrauma.Items.Components
 {
diff --git a/Barotrauma/BarotraumaShared/Source/Items/Components/Power/PowerTransfer.cs b/Barotrauma/BarotraumaShared/Source/Items/Components/Power/PowerTransfer.cs
index 219051fb5..a85bf451a 100644
--- a/Barotrauma/BarotraumaShared/Source/Items/Components/Power/PowerTransfer.cs
+++ b/Barotrauma/BarotraumaShared/Source/Items/Components/Power/PowerTransfer.cs
@@ -1,10 +1,7 @@
-using System.Collections.Generic;
-using System.Xml.Linq;
-using Microsoft.Xna.Framework;
-using Microsoft.Xna.Framework.Graphics;
+using Microsoft.Xna.Framework;
 using System;
-using System.Globalization;
-using System.Linq;
+using System.Collections.Generic;
+using System.Xml.Linq;
 
 namespace Barotrauma.Items.Components
 {
diff --git a/Barotrauma/BarotraumaShared/Source/Items/Components/Projectile.cs b/Barotrauma/BarotraumaShared/Source/Items/Components/Projectile.cs
index 999c35bb9..7a7dd25f8 100644
--- a/Barotrauma/BarotraumaShared/Source/Items/Components/Projectile.cs
+++ b/Barotrauma/BarotraumaShared/Source/Items/Components/Projectile.cs
@@ -1,11 +1,11 @@
-using System;
-using System.Collections.Generic;
-using System.Xml.Linq;
-using FarseerPhysics;
+using FarseerPhysics;
 using FarseerPhysics.Dynamics;
 using FarseerPhysics.Dynamics.Contacts;
 using FarseerPhysics.Dynamics.Joints;
 using Microsoft.Xna.Framework;
+using System;
+using System.Collections.Generic;
+using System.Xml.Linq;
 
 namespace Barotrauma.Items.Components
 {
diff --git a/Barotrauma/BarotraumaShared/Source/Items/Components/Rope.cs b/Barotrauma/BarotraumaShared/Source/Items/Components/Rope.cs
index 76445744b..b2ea35d7b 100644
--- a/Barotrauma/BarotraumaShared/Source/Items/Components/Rope.cs
+++ b/Barotrauma/BarotraumaShared/Source/Items/Components/Rope.cs
@@ -1,15 +1,13 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Xml.Linq;
-using FarseerPhysics;
+using FarseerPhysics;
 using FarseerPhysics.Collision.Shapes;
 using FarseerPhysics.Common;
 using FarseerPhysics.Dynamics;
 using FarseerPhysics.Dynamics.Joints;
 using FarseerPhysics.Factories;
 using Microsoft.Xna.Framework;
-using Microsoft.Xna.Framework.Graphics;
+using System;
+using System.Collections.Generic;
+using System.Xml.Linq;
 
 namespace Barotrauma.Items.Components
 {
diff --git a/Barotrauma/BarotraumaShared/Source/Items/Components/Signal/Connection.cs b/Barotrauma/BarotraumaShared/Source/Items/Components/Signal/Connection.cs
index 70572e7d4..9bbb59aa4 100644
--- a/Barotrauma/BarotraumaShared/Source/Items/Components/Signal/Connection.cs
+++ b/Barotrauma/BarotraumaShared/Source/Items/Components/Signal/Connection.cs
@@ -1,8 +1,5 @@
 using Microsoft.Xna.Framework;
-using Microsoft.Xna.Framework.Graphics;
-using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Xml.Linq;
 
 namespace Barotrauma.Items.Components
diff --git a/Barotrauma/BarotraumaShared/Source/Items/Components/Signal/ConnectionPanel.cs b/Barotrauma/BarotraumaShared/Source/Items/Components/Signal/ConnectionPanel.cs
index f405feda8..d052f9166 100644
--- a/Barotrauma/BarotraumaShared/Source/Items/Components/Signal/ConnectionPanel.cs
+++ b/Barotrauma/BarotraumaShared/Source/Items/Components/Signal/ConnectionPanel.cs
@@ -1,11 +1,9 @@
 using Barotrauma.Networking;
-using Microsoft.Xna.Framework;
-using Microsoft.Xna.Framework.Graphics;
-using System;
-using System.Linq;
-using System.Collections.Generic;
-using System.Xml.Linq;
 using Lidgren.Network;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Xml.Linq;
 
 namespace Barotrauma.Items.Components
 {
diff --git a/Barotrauma/BarotraumaShared/Source/Items/Components/Signal/DelayComponent.cs b/Barotrauma/BarotraumaShared/Source/Items/Components/Signal/DelayComponent.cs
index 64b152583..26f43867d 100644
--- a/Barotrauma/BarotraumaShared/Source/Items/Components/Signal/DelayComponent.cs
+++ b/Barotrauma/BarotraumaShared/Source/Items/Components/Signal/DelayComponent.cs
@@ -2,7 +2,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using System.Xml.Linq;
 
 namespace Barotrauma.Items.Components
diff --git a/Barotrauma/BarotraumaShared/Source/Items/Components/Signal/MotionSensor.cs b/Barotrauma/BarotraumaShared/Source/Items/Components/Signal/MotionSensor.cs
index ebed3e0a0..96f1a067d 100644
--- a/Barotrauma/BarotraumaShared/Source/Items/Components/Signal/MotionSensor.cs
+++ b/Barotrauma/BarotraumaShared/Source/Items/Components/Signal/MotionSensor.cs
@@ -1,9 +1,6 @@
 using Microsoft.Xna.Framework;
 using System;
-using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Xml.Linq;
 
 namespace Barotrauma.Items.Components
diff --git a/Barotrauma/BarotraumaShared/Source/Items/Components/Signal/RegExFindComponent.cs b/Barotrauma/BarotraumaShared/Source/Items/Components/Signal/RegExFindComponent.cs
index f16ae7f5e..50ee0e452 100644
--- a/Barotrauma/BarotraumaShared/Source/Items/Components/Signal/RegExFindComponent.cs
+++ b/Barotrauma/BarotraumaShared/Source/Items/Components/Signal/RegExFindComponent.cs
@@ -1,5 +1,5 @@
-using System.Xml.Linq;
-using System.Text.RegularExpressions;
+using System.Text.RegularExpressions;
+using System.Xml.Linq;
 
 namespace Barotrauma.Items.Components
 {
diff --git a/Barotrauma/BarotraumaShared/Source/Items/Components/StatusHUD.cs b/Barotrauma/BarotraumaShared/Source/Items/Components/StatusHUD.cs
index 28cf6ceb2..8d6335e1d 100644
--- a/Barotrauma/BarotraumaShared/Source/Items/Components/StatusHUD.cs
+++ b/Barotrauma/BarotraumaShared/Source/Items/Components/StatusHUD.cs
@@ -1,10 +1,4 @@
-using Microsoft.Xna.Framework.Graphics;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Xml.Linq;
-using Microsoft.Xna.Framework;
+using System.Xml.Linq;
 
 namespace Barotrauma.Items.Components
 {
diff --git a/Barotrauma/BarotraumaShared/Source/Items/Components/Turret.cs b/Barotrauma/BarotraumaShared/Source/Items/Components/Turret.cs
index af6944a7e..cc8e56337 100644
--- a/Barotrauma/BarotraumaShared/Source/Items/Components/Turret.cs
+++ b/Barotrauma/BarotraumaShared/Source/Items/Components/Turret.cs
@@ -1,12 +1,11 @@
-using System;
+using Barotrauma.Networking;
+using FarseerPhysics;
+using Lidgren.Network;
+using Microsoft.Xna.Framework;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Xml.Linq;
-using Microsoft.Xna.Framework;
-using Microsoft.Xna.Framework.Graphics;
-using FarseerPhysics;
-using Barotrauma.Networking;
-using Lidgren.Network;
 
 namespace Barotrauma.Items.Components
 {
diff --git a/Barotrauma/BarotraumaShared/Source/Items/FixRequirement.cs b/Barotrauma/BarotraumaShared/Source/Items/FixRequirement.cs
index b90539c9a..e3ef8fbfa 100644
--- a/Barotrauma/BarotraumaShared/Source/Items/FixRequirement.cs
+++ b/Barotrauma/BarotraumaShared/Source/Items/FixRequirement.cs
@@ -1,10 +1,4 @@
-using Barotrauma.Networking;
-using Microsoft.Xna.Framework;
-using Microsoft.Xna.Framework.Graphics;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+using System.Collections.Generic;
 using System.Xml.Linq;
 
 namespace Barotrauma
diff --git a/Barotrauma/BarotraumaShared/Source/Items/Inventory.cs b/Barotrauma/BarotraumaShared/Source/Items/Inventory.cs
index eb4a3fac6..8a55363ba 100644
--- a/Barotrauma/BarotraumaShared/Source/Items/Inventory.cs
+++ b/Barotrauma/BarotraumaShared/Source/Items/Inventory.cs
@@ -1,10 +1,10 @@
-using System.Linq;
+using Barotrauma.Items.Components;
+using Barotrauma.Networking;
 using Lidgren.Network;
 using Microsoft.Xna.Framework;
-using Barotrauma.Networking;
 using System;
 using System.Collections.Generic;
-using Barotrauma.Items.Components;
+using System.Linq;
 
 namespace Barotrauma
 {
diff --git a/Barotrauma/BarotraumaShared/Source/Items/Item.cs b/Barotrauma/BarotraumaShared/Source/Items/Item.cs
index 1ccc6d7df..cce88aad1 100644
--- a/Barotrauma/BarotraumaShared/Source/Items/Item.cs
+++ b/Barotrauma/BarotraumaShared/Source/Items/Item.cs
@@ -9,7 +9,6 @@ using Microsoft.Xna.Framework.Graphics;
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
-using System.ComponentModel;
 using System.Linq;
 using System.Xml.Linq;
 
diff --git a/Barotrauma/BarotraumaShared/Source/Items/ItemInventory.cs b/Barotrauma/BarotraumaShared/Source/Items/ItemInventory.cs
index 324823935..b7c369de4 100644
--- a/Barotrauma/BarotraumaShared/Source/Items/ItemInventory.cs
+++ b/Barotrauma/BarotraumaShared/Source/Items/ItemInventory.cs
@@ -1,5 +1,5 @@
-using Microsoft.Xna.Framework;
-using Barotrauma.Items.Components;
+using Barotrauma.Items.Components;
+using Microsoft.Xna.Framework;
 
 namespace Barotrauma
 {
diff --git a/Barotrauma/BarotraumaShared/Source/Items/ItemPrefab.cs b/Barotrauma/BarotraumaShared/Source/Items/ItemPrefab.cs
index d7c76e4c0..58f171bc2 100644
--- a/Barotrauma/BarotraumaShared/Source/Items/ItemPrefab.cs
+++ b/Barotrauma/BarotraumaShared/Source/Items/ItemPrefab.cs
@@ -1,10 +1,9 @@
-using System;
+using FarseerPhysics;
+using Microsoft.Xna.Framework;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Xml.Linq;
-using FarseerPhysics;
-using Microsoft.Xna.Framework;
-using Microsoft.Xna.Framework.Graphics;
 
 namespace Barotrauma
 {
diff --git a/Barotrauma/BarotraumaShared/Source/Map/Entity.cs b/Barotrauma/BarotraumaShared/Source/Map/Entity.cs
index 2c265aaa5..6079b6526 100644
--- a/Barotrauma/BarotraumaShared/Source/Map/Entity.cs
+++ b/Barotrauma/BarotraumaShared/Source/Map/Entity.cs
@@ -1,9 +1,7 @@
-using System.Collections.Generic;
-using Lidgren.Network;
-using Microsoft.Xna.Framework;
-using Barotrauma.Networking;
-using System.Linq;
+using Microsoft.Xna.Framework;
 using System;
+using System.Collections.Generic;
+using System.Linq;
 
 namespace Barotrauma
 {
diff --git a/Barotrauma/BarotraumaShared/Source/Map/Explosion.cs b/Barotrauma/BarotraumaShared/Source/Map/Explosion.cs
index 58c684c64..e900de839 100644
--- a/Barotrauma/BarotraumaShared/Source/Map/Explosion.cs
+++ b/Barotrauma/BarotraumaShared/Source/Map/Explosion.cs
@@ -1,9 +1,9 @@
-using Microsoft.Xna.Framework;
+using Barotrauma.Networking;
+using FarseerPhysics;
+using Microsoft.Xna.Framework;
 using System;
 using System.Collections.Generic;
 using System.Xml.Linq;
-using Barotrauma.Networking;
-using FarseerPhysics;
 
 namespace Barotrauma
 {
diff --git a/Barotrauma/BarotraumaShared/Source/Map/FireSource.cs b/Barotrauma/BarotraumaShared/Source/Map/FireSource.cs
index 887d98976..02bc1de08 100644
--- a/Barotrauma/BarotraumaShared/Source/Map/FireSource.cs
+++ b/Barotrauma/BarotraumaShared/Source/Map/FireSource.cs
@@ -1,8 +1,6 @@
 using Microsoft.Xna.Framework;
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using Barotrauma.Networking;
 #if CLIENT
 using Barotrauma.Lights;
diff --git a/Barotrauma/BarotraumaShared/Source/Map/Gap.cs b/Barotrauma/BarotraumaShared/Source/Map/Gap.cs
index 5c968136d..d39c31d81 100644
--- a/Barotrauma/BarotraumaShared/Source/Map/Gap.cs
+++ b/Barotrauma/BarotraumaShared/Source/Map/Gap.cs
@@ -1,11 +1,9 @@
-using System;
-using System.Collections.Generic;
-using System.Xml.Linq;
-using FarseerPhysics;
+using Barotrauma.Items.Components;
 using Microsoft.Xna.Framework;
-using Microsoft.Xna.Framework.Graphics;
+using System;
+using System.Collections.Generic;
 using System.Collections.ObjectModel;
-using Barotrauma.Items.Components;
+using System.Xml.Linq;
 
 namespace Barotrauma
 {
diff --git a/Barotrauma/BarotraumaShared/Source/Map/Hull.cs b/Barotrauma/BarotraumaShared/Source/Map/Hull.cs
index 027bd704f..23f4fed3a 100644
--- a/Barotrauma/BarotraumaShared/Source/Map/Hull.cs
+++ b/Barotrauma/BarotraumaShared/Source/Map/Hull.cs
@@ -1,14 +1,10 @@
-using System;
+using Barotrauma.Networking;
+using Lidgren.Network;
+using Microsoft.Xna.Framework;
+using System;
 using System.Collections.Generic;
-using System.ComponentModel;
 using System.Linq;
 using System.Xml.Linq;
-using FarseerPhysics;
-using FarseerPhysics.Dynamics;
-using Microsoft.Xna.Framework;
-using Microsoft.Xna.Framework.Graphics;
-using Lidgren.Network;
-using Barotrauma.Networking;
 
 namespace Barotrauma
 {
diff --git a/Barotrauma/BarotraumaShared/Source/Map/Levels/CaveGenerator.cs b/Barotrauma/BarotraumaShared/Source/Map/Levels/CaveGenerator.cs
index bb260d95e..790e08eff 100644
--- a/Barotrauma/BarotraumaShared/Source/Map/Levels/CaveGenerator.cs
+++ b/Barotrauma/BarotraumaShared/Source/Map/Levels/CaveGenerator.cs
@@ -1,15 +1,13 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-using System.Text;
-using Microsoft.Xna.Framework;
-using Voronoi2;
-using Microsoft.Xna.Framework.Graphics;
-using FarseerPhysics;
+using FarseerPhysics;
 using FarseerPhysics.Common;
 using FarseerPhysics.Dynamics;
 using FarseerPhysics.Factories;
+using Microsoft.Xna.Framework;
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using Voronoi2;
 
 namespace Barotrauma
 {
diff --git a/Barotrauma/BarotraumaShared/Source/Map/Levels/Level.cs b/Barotrauma/BarotraumaShared/Source/Map/Levels/Level.cs
index d9fe04fde..a2bcd31b0 100644
--- a/Barotrauma/BarotraumaShared/Source/Map/Levels/Level.cs
+++ b/Barotrauma/BarotraumaShared/Source/Map/Levels/Level.cs
@@ -1,16 +1,14 @@
-using FarseerPhysics;
-using FarseerPhysics.Common;
+using Barotrauma.RuinGeneration;
+using FarseerPhysics;
 using FarseerPhysics.Dynamics;
 using FarseerPhysics.Factories;
-using Lidgren.Network;
 using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
 using System;
-using System.Linq;
 using System.Collections.Generic;
 using System.Diagnostics;
+using System.Linq;
 using Voronoi2;
-using Barotrauma.RuinGeneration;
 
 namespace Barotrauma
 {
diff --git a/Barotrauma/BarotraumaShared/Source/Map/Levels/LevelGenerationParams.cs b/Barotrauma/BarotraumaShared/Source/Map/Levels/LevelGenerationParams.cs
index f9f33e5d9..4aa881f80 100644
--- a/Barotrauma/BarotraumaShared/Source/Map/Levels/LevelGenerationParams.cs
+++ b/Barotrauma/BarotraumaShared/Source/Map/Levels/LevelGenerationParams.cs
@@ -2,8 +2,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Xml.Linq;
 
 namespace Barotrauma
diff --git a/Barotrauma/BarotraumaShared/Source/Map/Levels/Ruins/BTRoom.cs b/Barotrauma/BarotraumaShared/Source/Map/Levels/Ruins/BTRoom.cs
index 4b9cdef63..3c651707b 100644
--- a/Barotrauma/BarotraumaShared/Source/Map/Levels/Ruins/BTRoom.cs
+++ b/Barotrauma/BarotraumaShared/Source/Map/Levels/Ruins/BTRoom.cs
@@ -2,8 +2,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Barotrauma.RuinGeneration
 {
diff --git a/Barotrauma/BarotraumaShared/Source/Map/Levels/Ruins/Corridor.cs b/Barotrauma/BarotraumaShared/Source/Map/Levels/Ruins/Corridor.cs
index 0131fb698..9975d186c 100644
--- a/Barotrauma/BarotraumaShared/Source/Map/Levels/Ruins/Corridor.cs
+++ b/Barotrauma/BarotraumaShared/Source/Map/Levels/Ruins/Corridor.cs
@@ -1,9 +1,6 @@
 using Microsoft.Xna.Framework;
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Barotrauma.RuinGeneration
 {
diff --git a/Barotrauma/BarotraumaShared/Source/Map/Levels/Ruins/RuinGenerator.cs b/Barotrauma/BarotraumaShared/Source/Map/Levels/Ruins/RuinGenerator.cs
index 8b439b67f..97674383f 100644
--- a/Barotrauma/BarotraumaShared/Source/Map/Levels/Ruins/RuinGenerator.cs
+++ b/Barotrauma/BarotraumaShared/Source/Map/Levels/Ruins/RuinGenerator.cs
@@ -1,5 +1,4 @@
 using Microsoft.Xna.Framework;
-using Microsoft.Xna.Framework.Graphics;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
diff --git a/Barotrauma/BarotraumaShared/Source/Map/Levels/Ruins/RuinStructure.cs b/Barotrauma/BarotraumaShared/Source/Map/Levels/Ruins/RuinStructure.cs
index dd0b8143e..66334c3f2 100644
--- a/Barotrauma/BarotraumaShared/Source/Map/Levels/Ruins/RuinStructure.cs
+++ b/Barotrauma/BarotraumaShared/Source/Map/Levels/Ruins/RuinStructure.cs
@@ -1,8 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Xml.Linq;
 
 namespace Barotrauma.RuinGeneration
diff --git a/Barotrauma/BarotraumaShared/Source/Map/Levels/Voronoi.cs b/Barotrauma/BarotraumaShared/Source/Map/Levels/Voronoi.cs
index 2804390e0..8be0768ff 100644
--- a/Barotrauma/BarotraumaShared/Source/Map/Levels/Voronoi.cs
+++ b/Barotrauma/BarotraumaShared/Source/Map/Levels/Voronoi.cs
@@ -6,20 +6,20 @@
  * 
  * To change this template use Tools | Options | Coding | Edit Standard Headers.
  */
- 
- /*
- * The author of this software is Steven Fortune.  Copyright (c) 1994 by AT&T
- * Bell Laboratories.
- * Permission to use, copy, modify, and distribute this software for any
- * purpose without fee is hereby granted, provided that this entire notice
- * is included in all copies of any software which is or includes a copy
- * or modification of this software and in all copies of the supporting
- * documentation for such software.
- * THIS SOFTWARE IS BEING PROVIDED "AS IS", WITHOUT ANY EXPRESS OR IMPLIED
- * WARRANTY.  IN PARTICULAR, NEITHER THE AUTHORS NOR AT&T MAKE ANY
- * REPRESENTATION OR WARRANTY OF ANY KIND CONCERNING THE MERCHANTABILITY
- * OF THIS SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR PURPOSE.
- */
+
+/*
+* The author of this software is Steven Fortune.  Copyright (c) 1994 by AT&T
+* Bell Laboratories.
+* Permission to use, copy, modify, and distribute this software for any
+* purpose without fee is hereby granted, provided that this entire notice
+* is included in all copies of any software which is or includes a copy
+* or modification of this software and in all copies of the supporting
+* documentation for such software.
+* THIS SOFTWARE IS BEING PROVIDED "AS IS", WITHOUT ANY EXPRESS OR IMPLIED
+* WARRANTY.  IN PARTICULAR, NEITHER THE AUTHORS NOR AT&T MAKE ANY
+* REPRESENTATION OR WARRANTY OF ANY KIND CONCERNING THE MERCHANTABILITY
+* OF THIS SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR PURPOSE.
+*/
 
 /* 
  * This code was originally written by Stephan Fortune in C code.  I, Shane O'Sullivan,
@@ -48,20 +48,20 @@
  * REPRESENTATION OR WARRANTY OF ANY KIND CONCERNING THE MERCHANTABILITY
  * OF THIS SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR PURPOSE.
  */
- 
- /*
- * C# Version by Burhan Joukhadar
- * 
- * Permission to use, copy, modify, and distribute this software for any
- * purpose without fee is hereby granted, provided that this entire notice
- * is included in all copies of any software which is or includes a copy
- * or modification of this software and in all copies of the supporting
- * documentation for such software.
- * THIS SOFTWARE IS BEING PROVIDED "AS IS", WITHOUT ANY EXPRESS OR IMPLIED
- * WARRANTY.  IN PARTICULAR, NEITHER THE AUTHORS NOR AT&T MAKE ANY
- * REPRESENTATION OR WARRANTY OF ANY KIND CONCERNING THE MERCHANTABILITY
- * OF THIS SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR PURPOSE.
- */
+
+/*
+* C# Version by Burhan Joukhadar
+* 
+* Permission to use, copy, modify, and distribute this software for any
+* purpose without fee is hereby granted, provided that this entire notice
+* is included in all copies of any software which is or includes a copy
+* or modification of this software and in all copies of the supporting
+* documentation for such software.
+* THIS SOFTWARE IS BEING PROVIDED "AS IS", WITHOUT ANY EXPRESS OR IMPLIED
+* WARRANTY.  IN PARTICULAR, NEITHER THE AUTHORS NOR AT&T MAKE ANY
+* REPRESENTATION OR WARRANTY OF ANY KIND CONCERNING THE MERCHANTABILITY
+* OF THIS SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR PURPOSE.
+*/
 
 using Microsoft.Xna.Framework;
 using System;
@@ -69,10 +69,10 @@ using System.Collections.Generic;
 
 namespace Voronoi2
 {
-	/// <summary>
-	/// Description of Voronoi.
-	/// </summary>
-	public class Voronoi
+    /// <summary>
+    /// Description of Voronoi.
+    /// </summary>
+    public class Voronoi
 	{
 		// ************* Private members ******************
 		double borderMinX, borderMaxX, borderMinY, borderMaxY;
diff --git a/Barotrauma/BarotraumaShared/Source/Map/Levels/VoronoiElements.cs b/Barotrauma/BarotraumaShared/Source/Map/Levels/VoronoiElements.cs
index 4ba871c21..a8e039f9b 100644
--- a/Barotrauma/BarotraumaShared/Source/Map/Levels/VoronoiElements.cs
+++ b/Barotrauma/BarotraumaShared/Source/Map/Levels/VoronoiElements.cs
@@ -50,15 +50,14 @@
  */
 
 
+using Barotrauma;
 using FarseerPhysics.Dynamics;
 using Microsoft.Xna.Framework;
-using Barotrauma;
-using System;
 using System.Collections.Generic;
 
 namespace Voronoi2
 {
-	public class Point
+    public class Point
 	{
 		public double x, y;
 		
diff --git a/Barotrauma/BarotraumaShared/Source/Map/Levels/WrappingWall.cs b/Barotrauma/BarotraumaShared/Source/Map/Levels/WrappingWall.cs
index d4f98fc46..84736c71b 100644
--- a/Barotrauma/BarotraumaShared/Source/Map/Levels/WrappingWall.cs
+++ b/Barotrauma/BarotraumaShared/Source/Map/Levels/WrappingWall.cs
@@ -1,11 +1,7 @@
 using FarseerPhysics;
 using Microsoft.Xna.Framework;
-using Microsoft.Xna.Framework.Graphics;
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-using System.Text;
 using Voronoi2;
 
 namespace Barotrauma
diff --git a/Barotrauma/BarotraumaShared/Source/Map/LinkedSubmarine.cs b/Barotrauma/BarotraumaShared/Source/Map/LinkedSubmarine.cs
index 04d8e65ec..60b9b6912 100644
--- a/Barotrauma/BarotraumaShared/Source/Map/LinkedSubmarine.cs
+++ b/Barotrauma/BarotraumaShared/Source/Map/LinkedSubmarine.cs
@@ -1,12 +1,8 @@
 using Barotrauma.Items.Components;
 using Microsoft.Xna.Framework;
-using Microsoft.Xna.Framework.Graphics;
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Xml.Linq;
 
 namespace Barotrauma
diff --git a/Barotrauma/BarotraumaShared/Source/Map/Map/LocationType.cs b/Barotrauma/BarotraumaShared/Source/Map/Map/LocationType.cs
index f34f1e2e6..1d05a31f6 100644
--- a/Barotrauma/BarotraumaShared/Source/Map/Map/LocationType.cs
+++ b/Barotrauma/BarotraumaShared/Source/Map/Map/LocationType.cs
@@ -3,7 +3,6 @@ using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
-using System.Text;
 using System.Xml.Linq;
 
 namespace Barotrauma
diff --git a/Barotrauma/BarotraumaShared/Source/Map/Map/Map.cs b/Barotrauma/BarotraumaShared/Source/Map/Map/Map.cs
index 4157e85e0..d48927ddb 100644
--- a/Barotrauma/BarotraumaShared/Source/Map/Map/Map.cs
+++ b/Barotrauma/BarotraumaShared/Source/Map/Map/Map.cs
@@ -1,5 +1,4 @@
 using Microsoft.Xna.Framework;
-using Microsoft.Xna.Framework.Graphics;
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/Barotrauma/BarotraumaShared/Source/Map/MapEntity.cs b/Barotrauma/BarotraumaShared/Source/Map/MapEntity.cs
index 1d56baa95..0315b2eaf 100644
--- a/Barotrauma/BarotraumaShared/Source/Map/MapEntity.cs
+++ b/Barotrauma/BarotraumaShared/Source/Map/MapEntity.cs
@@ -1,13 +1,12 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-using System.Xml.Linq;
+using Barotrauma.Items.Components;
 using FarseerPhysics;
 using Microsoft.Xna.Framework;
+using System;
+using System.Collections.Generic;
 //using Microsoft.Xna.Framework.Graphics;
 using System.Collections.ObjectModel;
-using Barotrauma.Items.Components;
+using System.Diagnostics;
+using System.Linq;
 
 namespace Barotrauma
 {
diff --git a/Barotrauma/BarotraumaShared/Source/Map/MapEntityPrefab.cs b/Barotrauma/BarotraumaShared/Source/Map/MapEntityPrefab.cs
index 752d388ef..e896eabde 100644
--- a/Barotrauma/BarotraumaShared/Source/Map/MapEntityPrefab.cs
+++ b/Barotrauma/BarotraumaShared/Source/Map/MapEntityPrefab.cs
@@ -1,8 +1,7 @@
-using System;
+using Microsoft.Xna.Framework;
+using System;
 using System.Collections.Generic;
 using System.Reflection;
-using Microsoft.Xna.Framework;
-using Microsoft.Xna.Framework.Graphics;
 
 namespace Barotrauma
 {
diff --git a/Barotrauma/BarotraumaShared/Source/Map/Structure.cs b/Barotrauma/BarotraumaShared/Source/Map/Structure.cs
index 2eac47531..1f6fc9355 100644
--- a/Barotrauma/BarotraumaShared/Source/Map/Structure.cs
+++ b/Barotrauma/BarotraumaShared/Source/Map/Structure.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Xml.Linq;
+using Barotrauma.Networking;
 using FarseerPhysics;
 using FarseerPhysics.Dynamics;
 using FarseerPhysics.Dynamics.Contacts;
@@ -9,7 +6,10 @@ using FarseerPhysics.Factories;
 using Lidgren.Network;
 using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
-using Barotrauma.Networking;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Xml.Linq;
 
 namespace Barotrauma
 {
diff --git a/Barotrauma/BarotraumaShared/Source/Map/StructurePrefab.cs b/Barotrauma/BarotraumaShared/Source/Map/StructurePrefab.cs
index cc9a9a9e4..d86c72ac8 100644
--- a/Barotrauma/BarotraumaShared/Source/Map/StructurePrefab.cs
+++ b/Barotrauma/BarotraumaShared/Source/Map/StructurePrefab.cs
@@ -1,8 +1,8 @@
-using System;
-using System.Xml.Linq;
-using Microsoft.Xna.Framework;
+using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
+using System;
 using System.Collections.Generic;
+using System.Xml.Linq;
 
 namespace Barotrauma
 {
diff --git a/Barotrauma/BarotraumaShared/Source/Map/Submarine.cs b/Barotrauma/BarotraumaShared/Source/Map/Submarine.cs
index f6d26a523..2f2496998 100644
--- a/Barotrauma/BarotraumaShared/Source/Map/Submarine.cs
+++ b/Barotrauma/BarotraumaShared/Source/Map/Submarine.cs
@@ -1,10 +1,8 @@
 using Barotrauma.Networking;
 using FarseerPhysics;
-using FarseerPhysics.Common;
 using FarseerPhysics.Dynamics;
 using Lidgren.Network;
 using Microsoft.Xna.Framework;
-using Microsoft.Xna.Framework.Graphics;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
diff --git a/Barotrauma/BarotraumaShared/Source/Map/SubmarineBody.cs b/Barotrauma/BarotraumaShared/Source/Map/SubmarineBody.cs
index 84e27994b..4f89e49a0 100644
--- a/Barotrauma/BarotraumaShared/Source/Map/SubmarineBody.cs
+++ b/Barotrauma/BarotraumaShared/Source/Map/SubmarineBody.cs
@@ -1,7 +1,6 @@
 using FarseerPhysics;
 using FarseerPhysics.Collision;
 using FarseerPhysics.Common;
-using FarseerPhysics.Common.Decomposition;
 using FarseerPhysics.Dynamics;
 using FarseerPhysics.Dynamics.Contacts;
 using FarseerPhysics.Factories;
diff --git a/Barotrauma/BarotraumaShared/Source/Map/TransitionCinematic.cs b/Barotrauma/BarotraumaShared/Source/Map/TransitionCinematic.cs
index 10064077c..6edeff425 100644
--- a/Barotrauma/BarotraumaShared/Source/Map/TransitionCinematic.cs
+++ b/Barotrauma/BarotraumaShared/Source/Map/TransitionCinematic.cs
@@ -2,9 +2,7 @@
 using Microsoft.Xna.Framework;
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.Linq;
-using System.Text;
 
 namespace Barotrauma
 {
diff --git a/Barotrauma/BarotraumaShared/Source/Map/WayPoint.cs b/Barotrauma/BarotraumaShared/Source/Map/WayPoint.cs
index fa3ab031f..781351c74 100644
--- a/Barotrauma/BarotraumaShared/Source/Map/WayPoint.cs
+++ b/Barotrauma/BarotraumaShared/Source/Map/WayPoint.cs
@@ -1,13 +1,13 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Xml.Linq;
+using Barotrauma.Items.Components;
 using FarseerPhysics;
+using FarseerPhysics.Dynamics;
 using Microsoft.Xna.Framework;
+using System;
+using System.Collections.Generic;
 //using Microsoft.Xna.Framework.Graphics;
 using System.Collections.ObjectModel;
-using Barotrauma.Items.Components;
-using FarseerPhysics.Dynamics;
+using System.Linq;
+using System.Xml.Linq;
 
 namespace Barotrauma
 {
diff --git a/Barotrauma/BarotraumaShared/Source/Networking/BanList.cs b/Barotrauma/BarotraumaShared/Source/Networking/BanList.cs
index 279f8c522..397243650 100644
--- a/Barotrauma/BarotraumaShared/Source/Networking/BanList.cs
+++ b/Barotrauma/BarotraumaShared/Source/Networking/BanList.cs
@@ -1,5 +1,4 @@
-using Microsoft.Xna.Framework;
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
diff --git a/Barotrauma/BarotraumaShared/Source/Networking/EntitySpawner.cs b/Barotrauma/BarotraumaShared/Source/Networking/EntitySpawner.cs
index fbdbdd10a..366aa3f00 100644
--- a/Barotrauma/BarotraumaShared/Source/Networking/EntitySpawner.cs
+++ b/Barotrauma/BarotraumaShared/Source/Networking/EntitySpawner.cs
@@ -1,8 +1,6 @@
 using Barotrauma.Networking;
 using Microsoft.Xna.Framework;
-using System;
 using System.Collections.Generic;
-using System.Linq;
 
 namespace Barotrauma
 {
diff --git a/Barotrauma/BarotraumaShared/Source/Networking/FileTransfer/FileSender.cs b/Barotrauma/BarotraumaShared/Source/Networking/FileTransfer/FileSender.cs
index 1d219ffad..6fd005a84 100644
--- a/Barotrauma/BarotraumaShared/Source/Networking/FileTransfer/FileSender.cs
+++ b/Barotrauma/BarotraumaShared/Source/Networking/FileTransfer/FileSender.cs
@@ -3,8 +3,6 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Barotrauma.Networking
 {
diff --git a/Barotrauma/BarotraumaShared/Source/Networking/GameServer.cs b/Barotrauma/BarotraumaShared/Source/Networking/GameServer.cs
index f13a2d0c6..f304e5d96 100644
--- a/Barotrauma/BarotraumaShared/Source/Networking/GameServer.cs
+++ b/Barotrauma/BarotraumaShared/Source/Networking/GameServer.cs
@@ -1,12 +1,12 @@
-using System;
+using Barotrauma.Items.Components;
+using Lidgren.Network;
+using Microsoft.Xna.Framework;
+using RestSharp;
+using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
 using System.Text;
-using Lidgren.Network;
-using Microsoft.Xna.Framework;
-using RestSharp;
-using Barotrauma.Items.Components;
 
 namespace Barotrauma.Networking
 {
diff --git a/Barotrauma/BarotraumaShared/Source/Networking/GameServerLogin.cs b/Barotrauma/BarotraumaShared/Source/Networking/GameServerLogin.cs
index 746ad4b9b..ecd36d9cc 100644
--- a/Barotrauma/BarotraumaShared/Source/Networking/GameServerLogin.cs
+++ b/Barotrauma/BarotraumaShared/Source/Networking/GameServerLogin.cs
@@ -2,9 +2,7 @@
 using Microsoft.Xna.Framework;
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Text;
-using System.Threading.Tasks;
 
 namespace Barotrauma.Networking
 {
diff --git a/Barotrauma/BarotraumaShared/Source/Networking/INetSerializable.cs b/Barotrauma/BarotraumaShared/Source/Networking/INetSerializable.cs
index d6159199a..fea3e8a06 100644
--- a/Barotrauma/BarotraumaShared/Source/Networking/INetSerializable.cs
+++ b/Barotrauma/BarotraumaShared/Source/Networking/INetSerializable.cs
@@ -1,5 +1,4 @@
-using System;
-using Lidgren.Network;
+using Lidgren.Network;
 
 namespace Barotrauma.Networking
 {
diff --git a/Barotrauma/BarotraumaShared/Source/Networking/NetIdUtils.cs b/Barotrauma/BarotraumaShared/Source/Networking/NetIdUtils.cs
index 7702e3006..c6780a008 100644
--- a/Barotrauma/BarotraumaShared/Source/Networking/NetIdUtils.cs
+++ b/Barotrauma/BarotraumaShared/Source/Networking/NetIdUtils.cs
@@ -1,9 +1,5 @@
 using System;
-using System.Collections.Generic;
 using System.Diagnostics;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Barotrauma.Networking
 {
diff --git a/Barotrauma/BarotraumaShared/Source/Networking/NetworkMember.cs b/Barotrauma/BarotraumaShared/Source/Networking/NetworkMember.cs
index 656cf226e..cd04d5b76 100644
--- a/Barotrauma/BarotraumaShared/Source/Networking/NetworkMember.cs
+++ b/Barotrauma/BarotraumaShared/Source/Networking/NetworkMember.cs
@@ -1,10 +1,9 @@
-using System;
-using System.Linq;
-using Microsoft.Xna.Framework;
-using Microsoft.Xna.Framework.Graphics;
-using System.Collections.Generic;
+using Barotrauma.Items.Components;
 using Lidgren.Network;
-using Barotrauma.Items.Components;
+using Microsoft.Xna.Framework;
+using System;
+using System.Collections.Generic;
+using System.Linq;
 
 namespace Barotrauma.Networking
 {
diff --git a/Barotrauma/BarotraumaShared/Source/Networking/Voting.cs b/Barotrauma/BarotraumaShared/Source/Networking/Voting.cs
index 34622ce7a..ab0a55c11 100644
--- a/Barotrauma/BarotraumaShared/Source/Networking/Voting.cs
+++ b/Barotrauma/BarotraumaShared/Source/Networking/Voting.cs
@@ -1,10 +1,8 @@
 using Barotrauma.Networking;
 using Lidgren.Network;
-using Microsoft.Xna.Framework;
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 
 namespace Barotrauma
 {
diff --git a/Barotrauma/BarotraumaShared/Source/Networking/WhiteList.cs b/Barotrauma/BarotraumaShared/Source/Networking/WhiteList.cs
index a0cd042f4..5991f6870 100644
--- a/Barotrauma/BarotraumaShared/Source/Networking/WhiteList.cs
+++ b/Barotrauma/BarotraumaShared/Source/Networking/WhiteList.cs
@@ -1,9 +1,7 @@
-using Microsoft.Xna.Framework;
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Text;
 
 namespace Barotrauma.Networking
 {
diff --git a/Barotrauma/BarotraumaShared/Source/Physics/Physics.cs b/Barotrauma/BarotraumaShared/Source/Physics/Physics.cs
index e63b97173..01f0a8fab 100644
--- a/Barotrauma/BarotraumaShared/Source/Physics/Physics.cs
+++ b/Barotrauma/BarotraumaShared/Source/Physics/Physics.cs
@@ -1,6 +1,4 @@
-using System;
-using FarseerPhysics.Dynamics;
-using Microsoft.Xna.Framework;
+using FarseerPhysics.Dynamics;
 
 namespace Barotrauma
 {
diff --git a/Barotrauma/BarotraumaShared/Source/Physics/PhysicsBody.cs b/Barotrauma/BarotraumaShared/Source/Physics/PhysicsBody.cs
index 8cc6a1395..1da67195f 100644
--- a/Barotrauma/BarotraumaShared/Source/Physics/PhysicsBody.cs
+++ b/Barotrauma/BarotraumaShared/Source/Physics/PhysicsBody.cs
@@ -1,14 +1,13 @@
-using System.Xml.Linq;
-using FarseerPhysics;
+using FarseerPhysics;
 using FarseerPhysics.Dynamics;
 using FarseerPhysics.Factories;
 using Microsoft.Xna.Framework;
-using Microsoft.Xna.Framework.Graphics;
-using System.Collections.Generic;
 using System;
+using System.Collections.Generic;
+using System.Xml.Linq;
 
 namespace Barotrauma
-{     
+{
     class PosInfo
     {
         public Vector2 Position
diff --git a/Barotrauma/BarotraumaShared/Source/PlayerInput.cs b/Barotrauma/BarotraumaShared/Source/PlayerInput.cs
index bb45cd133..de76504a4 100644
--- a/Barotrauma/BarotraumaShared/Source/PlayerInput.cs
+++ b/Barotrauma/BarotraumaShared/Source/PlayerInput.cs
@@ -1,5 +1,4 @@
-using Microsoft.Xna.Framework;
-using Microsoft.Xna.Framework.Input;
+using Microsoft.Xna.Framework.Input;
 
 namespace Barotrauma
 {
diff --git a/Barotrauma/BarotraumaShared/Source/Properties.cs b/Barotrauma/BarotraumaShared/Source/Properties.cs
index 18719ed9c..076da9f4f 100644
--- a/Barotrauma/BarotraumaShared/Source/Properties.cs
+++ b/Barotrauma/BarotraumaShared/Source/Properties.cs
@@ -1,11 +1,10 @@
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.Globalization;
 using System.Linq;
-using System.Linq.Expressions;
 using System.Reflection;
 using System.Xml.Linq;
-using System.ComponentModel;
 
 
 namespace Barotrauma
diff --git a/Barotrauma/BarotraumaShared/Source/Screens/NetLobbyScreen.cs b/Barotrauma/BarotraumaShared/Source/Screens/NetLobbyScreen.cs
index 7839f669e..952087fc9 100644
--- a/Barotrauma/BarotraumaShared/Source/Screens/NetLobbyScreen.cs
+++ b/Barotrauma/BarotraumaShared/Source/Screens/NetLobbyScreen.cs
@@ -1,11 +1,5 @@
-using System;
-using Barotrauma.Networking;
-using System.Linq;
-using System.Collections.Generic;
-using System.Reflection;
-using System.ComponentModel;
-using Microsoft.Xna.Framework;
-using Microsoft.Xna.Framework.Graphics;
+using Barotrauma.Networking;
+using System;
 
 namespace Barotrauma
 {
diff --git a/Barotrauma/BarotraumaShared/Source/Screens/Screen.cs b/Barotrauma/BarotraumaShared/Source/Screens/Screen.cs
index 8e96b37d0..0bdf22d05 100644
--- a/Barotrauma/BarotraumaShared/Source/Screens/Screen.cs
+++ b/Barotrauma/BarotraumaShared/Source/Screens/Screen.cs
@@ -1,9 +1,4 @@
-using Microsoft.Xna.Framework;
-using Microsoft.Xna.Framework.Graphics;
-using System;
-using System.Collections.Generic;
-
-namespace Barotrauma
+namespace Barotrauma
 {
     partial class Screen
     {
diff --git a/Barotrauma/BarotraumaShared/Source/Sprite/Sprite.cs b/Barotrauma/BarotraumaShared/Source/Sprite/Sprite.cs
index 5ec850149..a2f944c87 100644
--- a/Barotrauma/BarotraumaShared/Source/Sprite/Sprite.cs
+++ b/Barotrauma/BarotraumaShared/Source/Sprite/Sprite.cs
@@ -1,9 +1,7 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Xml.Linq;
-using Microsoft.Xna.Framework;
+using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
+using System.Collections.Generic;
+using System.Xml.Linq;
 
 namespace Barotrauma
 {
diff --git a/Barotrauma/BarotraumaShared/Source/Timing.cs b/Barotrauma/BarotraumaShared/Source/Timing.cs
index a2b21c62f..6e670dcfb 100644
--- a/Barotrauma/BarotraumaShared/Source/Timing.cs
+++ b/Barotrauma/BarotraumaShared/Source/Timing.cs
@@ -1,9 +1,5 @@
 using Microsoft.Xna.Framework;
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Barotrauma
 {
diff --git a/Barotrauma/BarotraumaShared/Source/Utils/Homoglyphs.cs b/Barotrauma/BarotraumaShared/Source/Utils/Homoglyphs.cs
index a6ce3b32c..70157f98f 100644
--- a/Barotrauma/BarotraumaShared/Source/Utils/Homoglyphs.cs
+++ b/Barotrauma/BarotraumaShared/Source/Utils/Homoglyphs.cs
@@ -1,8 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Barotrauma
 {
diff --git a/Barotrauma/BarotraumaShared/Source/Utils/MathUtils.cs b/Barotrauma/BarotraumaShared/Source/Utils/MathUtils.cs
index c8984c989..637afaeef 100644
--- a/Barotrauma/BarotraumaShared/Source/Utils/MathUtils.cs
+++ b/Barotrauma/BarotraumaShared/Source/Utils/MathUtils.cs
@@ -1,8 +1,6 @@
 using Microsoft.Xna.Framework;
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 
 namespace Barotrauma
 {
diff --git a/Barotrauma/BarotraumaShared/Source/Utils/SaveUtil.cs b/Barotrauma/BarotraumaShared/Source/Utils/SaveUtil.cs
index 874a27184..3fa1447fa 100644
--- a/Barotrauma/BarotraumaShared/Source/Utils/SaveUtil.cs
+++ b/Barotrauma/BarotraumaShared/Source/Utils/SaveUtil.cs
@@ -2,7 +2,6 @@
 using System.IO;
 using System.IO.Compression;
 using System.Text;
-using System.Xml.Linq;
 
 namespace Barotrauma
 {
diff --git a/Barotrauma/BarotraumaShared/Source/Utils/ToolBox.cs b/Barotrauma/BarotraumaShared/Source/Utils/ToolBox.cs
index 78fad5ddd..b4dd0bfb9 100644
--- a/Barotrauma/BarotraumaShared/Source/Utils/ToolBox.cs
+++ b/Barotrauma/BarotraumaShared/Source/Utils/ToolBox.cs
@@ -1,6 +1,5 @@
 using Lidgren.Network;
 using Microsoft.Xna.Framework;
-using Microsoft.Xna.Framework.Graphics;
 using System;
 using System.Globalization;
 using System.IO;
diff --git a/Barotrauma/BarotraumaShared/Source/Utils/UpdaterUtil.cs b/Barotrauma/BarotraumaShared/Source/Utils/UpdaterUtil.cs
index e139b755e..a1bca5212 100644
--- a/Barotrauma/BarotraumaShared/Source/Utils/UpdaterUtil.cs
+++ b/Barotrauma/BarotraumaShared/Source/Utils/UpdaterUtil.cs
@@ -3,7 +3,6 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Security.Cryptography;
-using System.Text;
 using System.Xml.Linq;
 
 namespace Barotrauma