diff --git a/Source/Core/Actions/Action.cs b/Source/Core/Actions/Action.cs
index 485fc643dcc7c7f34959c057c19a793b187132e3..267db958055bee5d6e017b7352571e1b7d22cf00 100644
--- a/Source/Core/Actions/Action.cs
+++ b/Source/Core/Actions/Action.cs
@@ -16,11 +16,7 @@
 
 #region ================== Namespaces
 
-using System;
 using System.Collections.Generic;
-using System.ComponentModel;
-using System.Drawing;
-using System.Text;
 using System.Windows.Forms;
 using CodeImp.DoomBuilder.IO;
 
diff --git a/Source/Core/Actions/ActionAttribute.cs b/Source/Core/Actions/ActionAttribute.cs
index 1f76ac4b1f74e08919c9d957e5cdb2861855aa01..7a456b7d87339def7a94d21ecb8bb714b0417a48 100644
--- a/Source/Core/Actions/ActionAttribute.cs
+++ b/Source/Core/Actions/ActionAttribute.cs
@@ -17,10 +17,6 @@
 #region ================== Namespaces
 
 using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Drawing;
-using System.Text;
 using System.Reflection;
 
 #endregion
diff --git a/Source/Core/Actions/ActionDelegate.cs b/Source/Core/Actions/ActionDelegate.cs
index 3686d5b838be7049c6a18fefa5b15e6661be0058..1a2bcfad74372bd8063e49e214309c23034f60be 100644
--- a/Source/Core/Actions/ActionDelegate.cs
+++ b/Source/Core/Actions/ActionDelegate.cs
@@ -16,12 +16,6 @@
 
 #region ================== Namespaces
 
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Drawing;
-using System.Text;
-
 #endregion
 
 namespace CodeImp.DoomBuilder.Actions
diff --git a/Source/Core/Actions/ActionManager.cs b/Source/Core/Actions/ActionManager.cs
index 678d66d25fe4454bc3650f17fbc33e1913d3e0d3..e004c9cf2f540f379f377e1c97f7130c3ac4ce32 100644
--- a/Source/Core/Actions/ActionManager.cs
+++ b/Source/Core/Actions/ActionManager.cs
@@ -18,10 +18,7 @@
 
 using System;
 using System.Collections.Generic;
-using System.ComponentModel;
-using System.Drawing;
 using System.Text;
-using CodeImp.DoomBuilder.Properties;
 using System.IO;
 using CodeImp.DoomBuilder.IO;
 using System.Collections;
diff --git a/Source/Core/Actions/BeginActionAttribute.cs b/Source/Core/Actions/BeginActionAttribute.cs
index a330ab74e01749c3186a2625616851f2a01eefe3..ef19c9018f1f5870214141b23f436fb926b20792 100644
--- a/Source/Core/Actions/BeginActionAttribute.cs
+++ b/Source/Core/Actions/BeginActionAttribute.cs
@@ -16,13 +16,6 @@
 
 #region ================== Namespaces
 
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Drawing;
-using System.Text;
-using System.Reflection;
-
 #endregion
 
 namespace CodeImp.DoomBuilder.Actions
diff --git a/Source/Core/Actions/EndActionAttribute.cs b/Source/Core/Actions/EndActionAttribute.cs
index 5fe0c726ad6b8a02836b8b1b663a3a0b2a2a02ad..8f69faded69e48f5042ca93af5fc72edf73b3569 100644
--- a/Source/Core/Actions/EndActionAttribute.cs
+++ b/Source/Core/Actions/EndActionAttribute.cs
@@ -16,13 +16,6 @@
 
 #region ================== Namespaces
 
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Drawing;
-using System.Text;
-using System.Reflection;
-
 #endregion
 
 namespace CodeImp.DoomBuilder.Actions
diff --git a/Source/Core/Actions/KeyControl.cs b/Source/Core/Actions/KeyControl.cs
index c9e17f110d6cba2c4e6eab9f8d3aa95300737e31..05b3c26a9748d492a7070d6aa1bdd703fa2abcad 100644
--- a/Source/Core/Actions/KeyControl.cs
+++ b/Source/Core/Actions/KeyControl.cs
@@ -16,15 +16,6 @@
 
 #region ================== Namespaces
 
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Drawing;
-using System.Text;
-using CodeImp.DoomBuilder.Properties;
-using System.IO;
-using CodeImp.DoomBuilder.IO;
-using System.Collections;
 using System.Windows.Forms;
 
 #endregion
diff --git a/Source/Core/Actions/MouseInput.cs b/Source/Core/Actions/MouseInput.cs
index 86e34303e86ac15d027dc83728f95ed49f77bbf5..cd262987182f440362e527b4f3248adfd98ceeb8 100644
--- a/Source/Core/Actions/MouseInput.cs
+++ b/Source/Core/Actions/MouseInput.cs
@@ -17,14 +17,6 @@
 #region ================== Namespaces
 
 using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Drawing;
-using System.Text;
-using CodeImp.DoomBuilder.Properties;
-using System.IO;
-using CodeImp.DoomBuilder.IO;
-using System.Collections;
 using System.Windows.Forms;
 using SlimDX;
 using SlimDX.DirectInput;
diff --git a/Source/Core/Actions/SpecialKeys.cs b/Source/Core/Actions/SpecialKeys.cs
index 4ed78c8713000f8b88ad0dd027fee83c8eba85c1..b9dd201df548f2057370d80fba301b91aac327fc 100644
--- a/Source/Core/Actions/SpecialKeys.cs
+++ b/Source/Core/Actions/SpecialKeys.cs
@@ -16,12 +16,6 @@
 
 #region ================== Namespaces
 
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Drawing;
-using System.Text;
-
 #endregion
 
 namespace CodeImp.DoomBuilder.Actions
diff --git a/Source/Core/Compilers/AccCompiler.cs b/Source/Core/Compilers/AccCompiler.cs
index c25156b01e1b71c9748e7e07608254213c970d75..34e87c4b980f39d82963e0c0d28d01f4bf327ec5 100644
--- a/Source/Core/Compilers/AccCompiler.cs
+++ b/Source/Core/Compilers/AccCompiler.cs
@@ -17,15 +17,9 @@
 #region ================== Namespaces
 
 using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Text;
-using System.Runtime.InteropServices;
 using System.Diagnostics;
 using System.IO;
 using CodeImp.DoomBuilder.Config;
-using CodeImp.DoomBuilder.IO;
 using System.Windows.Forms;
 using System.Text.RegularExpressions;
 
diff --git a/Source/Core/Compilers/Compiler.cs b/Source/Core/Compilers/Compiler.cs
index 182c254802b456be26bcde9119a71ce76155468b..84de9d611ac52be4cd32364948a1ae74e735afee 100644
--- a/Source/Core/Compilers/Compiler.cs
+++ b/Source/Core/Compilers/Compiler.cs
@@ -17,16 +17,13 @@
 #region ================== Namespaces
 
 using System;
-using System.Collections;
 using System.Collections.Generic;
 using System.Globalization;
-using System.Text;
-using System.Runtime.InteropServices;
 using System.Diagnostics;
 using System.Reflection;
 using System.IO;
 using CodeImp.DoomBuilder.Config;
-using CodeImp.DoomBuilder.IO;
+
 
 #endregion
 
diff --git a/Source/Core/Compilers/CompilerError.cs b/Source/Core/Compilers/CompilerError.cs
index 956317d947736f8a0ee6e3262c53fa3143621464..2aba2da60e88478c02cf4ca7110a4ab633424d8a 100644
--- a/Source/Core/Compilers/CompilerError.cs
+++ b/Source/Core/Compilers/CompilerError.cs
@@ -16,14 +16,6 @@
 
 #region ================== Namespaces
 
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Text;
-using System.Runtime.InteropServices;
-using System.Diagnostics;
-
 #endregion
 
 namespace CodeImp.DoomBuilder.Compilers
diff --git a/Source/Core/Compilers/NodesCompiler.cs b/Source/Core/Compilers/NodesCompiler.cs
index e19d30fea1c251f8df83b73fc12d3cb745386a9c..1ed2180051043fec841be55342f80cbf6477ad6d 100644
--- a/Source/Core/Compilers/NodesCompiler.cs
+++ b/Source/Core/Compilers/NodesCompiler.cs
@@ -17,11 +17,6 @@
 #region ================== Namespaces
 
 using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Text;
-using System.Runtime.InteropServices;
 using System.Diagnostics;
 using System.IO;
 using CodeImp.DoomBuilder.Config;
diff --git a/Source/Core/Config/AllTexturesSet.cs b/Source/Core/Config/AllTexturesSet.cs
index af732b54d03820407fb2dddff719780a6e1fb6b9..1bcb2566c2e4055e1e4dd2ff325a79b426acac4e 100644
--- a/Source/Core/Config/AllTexturesSet.cs
+++ b/Source/Core/Config/AllTexturesSet.cs
@@ -16,18 +16,8 @@
 
 #region ================== Namespaces
 
-using System;
-using System.Collections;
 using System.Collections.Generic;
-using System.Globalization;
-using System.Text;
-using CodeImp.DoomBuilder.IO;
 using CodeImp.DoomBuilder.Data;
-using System.IO;
-using System.Diagnostics;
-using System.Windows.Forms;
-using System.Text.RegularExpressions;
-using System.Collections.Specialized;
 
 #endregion
 
diff --git a/Source/Core/Config/ArgumentInfo.cs b/Source/Core/Config/ArgumentInfo.cs
index 58fec3dc5b2c6ac206ba9fdd75bec57b3cafd9bb..8767fe29f4c00ac50c5638a49ddd102bd2461fb4 100644
--- a/Source/Core/Config/ArgumentInfo.cs
+++ b/Source/Core/Config/ArgumentInfo.cs
@@ -16,15 +16,10 @@
 
 #region ================== Namespaces
 
-using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Globalization;
-using System.Text;
 using CodeImp.DoomBuilder.IO;
-using CodeImp.DoomBuilder.Data;
-using System.IO;
-using System.Diagnostics;
 
 #endregion
 
diff --git a/Source/Core/Config/CompilerInfo.cs b/Source/Core/Config/CompilerInfo.cs
index 18368cc907d92e67c00dbdab01332d78b8f0e185..6a4e20f6beb53c24d8348c5acbb3fc4d36f3146c 100644
--- a/Source/Core/Config/CompilerInfo.cs
+++ b/Source/Core/Config/CompilerInfo.cs
@@ -16,15 +16,9 @@
 
 #region ================== Namespaces
 
-using System;
 using System.Collections;
 using System.Collections.Generic;
-using System.Globalization;
-using System.Text;
 using CodeImp.DoomBuilder.IO;
-using CodeImp.DoomBuilder.Data;
-using System.IO;
-using System.Diagnostics;
 using CodeImp.DoomBuilder.Compilers;
 
 #endregion
diff --git a/Source/Core/Config/ConfigurationInfo.cs b/Source/Core/Config/ConfigurationInfo.cs
index e5e0a6b5c87dd0eba648057eec0b7247cf9bf2f8..4789c19dbd4fb5d3b03ab600f64da789f71d569e 100644
--- a/Source/Core/Config/ConfigurationInfo.cs
+++ b/Source/Core/Config/ConfigurationInfo.cs
@@ -20,7 +20,6 @@ using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Globalization;
-using System.Text;
 using CodeImp.DoomBuilder.IO;
 using CodeImp.DoomBuilder.Data;
 using System.IO;
diff --git a/Source/Core/Config/DefinedTextureSet.cs b/Source/Core/Config/DefinedTextureSet.cs
index 44065a6b11f80169f298a43cbe7f143830d4a5a5..fbf7c456853b68e2561e7afa5573724e0fa81ac4 100644
--- a/Source/Core/Config/DefinedTextureSet.cs
+++ b/Source/Core/Config/DefinedTextureSet.cs
@@ -16,17 +16,9 @@
 
 #region ================== Namespaces
 
-using System;
 using System.Collections;
 using System.Collections.Generic;
-using System.Globalization;
-using System.Text;
 using CodeImp.DoomBuilder.IO;
-using CodeImp.DoomBuilder.Data;
-using System.IO;
-using System.Diagnostics;
-using System.Windows.Forms;
-using System.Text.RegularExpressions;
 using System.Collections.Specialized;
 
 #endregion
diff --git a/Source/Core/Config/EnumItem.cs b/Source/Core/Config/EnumItem.cs
index d5e9257889b33fb7aef5c892abd17e89f7c6e585..e354c7323c248714d7a46c3ce8975f5f5f8d3268 100644
--- a/Source/Core/Config/EnumItem.cs
+++ b/Source/Core/Config/EnumItem.cs
@@ -16,16 +16,7 @@
 
 #region ================== Namespaces
 
-using System;
-using System.Collections;
-using System.Collections.Generic;
 using System.Globalization;
-using System.Text;
-using CodeImp.DoomBuilder.IO;
-using CodeImp.DoomBuilder.Data;
-using System.IO;
-using System.Diagnostics;
-using System.Windows.Forms;
 
 #endregion
 
diff --git a/Source/Core/Config/EnumList.cs b/Source/Core/Config/EnumList.cs
index 435928a4e90bc4e12ac4b1859b9126cfbd0343d6..6f96779b718e8313b13096e8c3ff6667b2b653f9 100644
--- a/Source/Core/Config/EnumList.cs
+++ b/Source/Core/Config/EnumList.cs
@@ -16,16 +16,9 @@
 
 #region ================== Namespaces
 
-using System;
 using System.Collections;
 using System.Collections.Generic;
-using System.Globalization;
-using System.Text;
 using CodeImp.DoomBuilder.IO;
-using CodeImp.DoomBuilder.Data;
-using System.IO;
-using System.Diagnostics;
-using System.Windows.Forms;
 
 #endregion
 
diff --git a/Source/Core/Config/FlagTranslation.cs b/Source/Core/Config/FlagTranslation.cs
index 86cd1647bf14c98b2b2cf455f42e74b6355645fd..60146b9ded6e07ad6f2c928557a5646288391aa9 100644
--- a/Source/Core/Config/FlagTranslation.cs
+++ b/Source/Core/Config/FlagTranslation.cs
@@ -19,13 +19,6 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
-using System.Globalization;
-using System.Text;
-using CodeImp.DoomBuilder.IO;
-using CodeImp.DoomBuilder.Data;
-using System.IO;
-using System.Diagnostics;
-using System.Windows.Forms;
 
 #endregion
 
diff --git a/Source/Core/Config/GameConfiguration.cs b/Source/Core/Config/GameConfiguration.cs
index fa56da703442ce5875f74c38de2042dd77f314fd..279e7567fda82db392b2d1bfd7862674be1e5ada 100644
--- a/Source/Core/Config/GameConfiguration.cs
+++ b/Source/Core/Config/GameConfiguration.cs
@@ -20,12 +20,7 @@ using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Globalization;
-using System.Text;
 using CodeImp.DoomBuilder.IO;
-using CodeImp.DoomBuilder.Data;
-using System.IO;
-using System.Diagnostics;
-using System.Windows.Forms;
 using CodeImp.DoomBuilder.Map;
 using CodeImp.DoomBuilder.Editing;
 
diff --git a/Source/Core/Config/GeneralizedBit.cs b/Source/Core/Config/GeneralizedBit.cs
index 8def54d8fa8d5d6a6f2388ab4cf8eea3a0702908..6eac008a413a49f9d18a13fbf10629df3ab10ba9 100644
--- a/Source/Core/Config/GeneralizedBit.cs
+++ b/Source/Core/Config/GeneralizedBit.cs
@@ -1,8 +1,4 @@
 using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Text;
 
 namespace CodeImp.DoomBuilder.Config
 {
diff --git a/Source/Core/Config/GeneralizedCategory.cs b/Source/Core/Config/GeneralizedCategory.cs
index ac022e8df92d92ec963a96988189cf3a5daa21e7..b457b3c7d05f41d6dbb082ebacf40852e4ea4039 100644
--- a/Source/Core/Config/GeneralizedCategory.cs
+++ b/Source/Core/Config/GeneralizedCategory.cs
@@ -1,8 +1,6 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
-using System.Globalization;
-using System.Text;
 using CodeImp.DoomBuilder.IO;
 
 namespace CodeImp.DoomBuilder.Config
diff --git a/Source/Core/Config/GeneralizedOption.cs b/Source/Core/Config/GeneralizedOption.cs
index 4940b6f47fe9f1498e6a587b21232696c444a615..99b716505d34b06ebdabf7cd9729344e23264a3b 100644
--- a/Source/Core/Config/GeneralizedOption.cs
+++ b/Source/Core/Config/GeneralizedOption.cs
@@ -20,13 +20,6 @@ using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Globalization;
-using System.Text;
-using CodeImp.DoomBuilder.IO;
-using CodeImp.DoomBuilder.Data;
-using System.IO;
-using System.Diagnostics;
-using System.Windows.Forms;
-using CodeImp.DoomBuilder.Map;
 
 #endregion
 
diff --git a/Source/Core/Config/IFilledTextureSet.cs b/Source/Core/Config/IFilledTextureSet.cs
index 9717ef4f9b320ea024da20205aefd87e6348874b..bf9453f440c941cecef05618884944b077a959d0 100644
--- a/Source/Core/Config/IFilledTextureSet.cs
+++ b/Source/Core/Config/IFilledTextureSet.cs
@@ -16,17 +16,8 @@
 
 #region ================== Namespaces
 
-using System;
-using System.Collections;
 using System.Collections.Generic;
-using System.Globalization;
-using System.Text;
-using CodeImp.DoomBuilder.IO;
 using CodeImp.DoomBuilder.Data;
-using System.IO;
-using System.Diagnostics;
-using System.Windows.Forms;
-using CodeImp.DoomBuilder.Rendering;
 
 #endregion
 
diff --git a/Source/Core/Config/INumberedTitle.cs b/Source/Core/Config/INumberedTitle.cs
index d2bbd7b7cb7f6201d57f924d71d3221c71a96b8c..9ad37fcb3377e227349e4d1b3d99c0e31980641f 100644
--- a/Source/Core/Config/INumberedTitle.cs
+++ b/Source/Core/Config/INumberedTitle.cs
@@ -16,18 +16,6 @@
 
 #region ================== Namespaces
 
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Text;
-using CodeImp.DoomBuilder.IO;
-using CodeImp.DoomBuilder.Data;
-using System.IO;
-using System.Diagnostics;
-using System.Windows.Forms;
-using CodeImp.DoomBuilder.Rendering;
-
 #endregion
 
 namespace CodeImp.DoomBuilder.Config
diff --git a/Source/Core/Config/LinedefActionCategory.cs b/Source/Core/Config/LinedefActionCategory.cs
index 8768e5aa310001550361de415edc0d3de461c0b2..f263d90eaebb5aa0da3e6f2e1754c1ba4c25af01 100644
--- a/Source/Core/Config/LinedefActionCategory.cs
+++ b/Source/Core/Config/LinedefActionCategory.cs
@@ -17,16 +17,7 @@
 #region ================== Namespaces
 
 using System;
-using System.Collections;
 using System.Collections.Generic;
-using System.Globalization;
-using System.Text;
-using CodeImp.DoomBuilder.IO;
-using CodeImp.DoomBuilder.Data;
-using System.IO;
-using System.Diagnostics;
-using System.Windows.Forms;
-using CodeImp.DoomBuilder.Rendering;
 
 #endregion
 
diff --git a/Source/Core/Config/LinedefActionInfo.cs b/Source/Core/Config/LinedefActionInfo.cs
index aaaf7da0ad1972dd05000e197035980ae51bc413..85ac463da7fe286debc4a78eb212e3da13f5b45a 100644
--- a/Source/Core/Config/LinedefActionInfo.cs
+++ b/Source/Core/Config/LinedefActionInfo.cs
@@ -17,15 +17,9 @@
 #region ================== Namespaces
 
 using System;
-using System.Collections;
 using System.Collections.Generic;
 using System.Globalization;
-using System.Text;
 using CodeImp.DoomBuilder.IO;
-using CodeImp.DoomBuilder.Data;
-using System.IO;
-using System.Diagnostics;
-using System.Windows.Forms;
 using CodeImp.DoomBuilder.Map;
 
 #endregion
diff --git a/Source/Core/Config/LinedefActivateInfo.cs b/Source/Core/Config/LinedefActivateInfo.cs
index e59a76a459b1c16ae20a7d0231f94d18bcf76709..32c3f251d0fa2dc3ae1b712b8dcf1c8416fcdcba 100644
--- a/Source/Core/Config/LinedefActivateInfo.cs
+++ b/Source/Core/Config/LinedefActivateInfo.cs
@@ -17,16 +17,6 @@
 #region ================== Namespaces
 
 using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Text;
-using CodeImp.DoomBuilder.IO;
-using CodeImp.DoomBuilder.Data;
-using System.IO;
-using System.Diagnostics;
-using System.Windows.Forms;
-using CodeImp.DoomBuilder.Map;
 
 #endregion
 
diff --git a/Source/Core/Config/MapLumpInfo.cs b/Source/Core/Config/MapLumpInfo.cs
index 8ca4a23969ffc8b1a136708f57defd438b5eb46c..bef4a60e7e3f9f40df3f1e5b3fcd9d77d637d12e 100644
--- a/Source/Core/Config/MapLumpInfo.cs
+++ b/Source/Core/Config/MapLumpInfo.cs
@@ -16,18 +16,7 @@
 
 #region ================== Namespaces
 
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Text;
 using CodeImp.DoomBuilder.IO;
-using CodeImp.DoomBuilder.Data;
-using System.IO;
-using System.Diagnostics;
-using System.Windows.Forms;
-using CodeImp.DoomBuilder.Map;
-using System.Collections.ObjectModel;
 
 #endregion
 
diff --git a/Source/Core/Config/MatchingTextureSet.cs b/Source/Core/Config/MatchingTextureSet.cs
index 72bf0be314284dcdc3e896a1607885e27c60d1d0..e6e09e12ccb921ac64f78ba1894a08af2279b50a 100644
--- a/Source/Core/Config/MatchingTextureSet.cs
+++ b/Source/Core/Config/MatchingTextureSet.cs
@@ -17,17 +17,10 @@
 #region ================== Namespaces
 
 using System;
-using System.Collections;
 using System.Collections.Generic;
-using System.Globalization;
 using System.Text;
-using CodeImp.DoomBuilder.IO;
 using CodeImp.DoomBuilder.Data;
-using System.IO;
-using System.Diagnostics;
-using System.Windows.Forms;
 using System.Text.RegularExpressions;
-using System.Collections.Specialized;
 
 #endregion
 
diff --git a/Source/Core/Config/NodebuilderInfo.cs b/Source/Core/Config/NodebuilderInfo.cs
index e1bbdb51f1ebecf04c1f1c8f4ea6548c9cd86399..ce1b7fc49556312e402339ddaffda9004c8ac9f5 100644
--- a/Source/Core/Config/NodebuilderInfo.cs
+++ b/Source/Core/Config/NodebuilderInfo.cs
@@ -17,15 +17,7 @@
 #region ================== Namespaces
 
 using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Text;
 using CodeImp.DoomBuilder.IO;
-using CodeImp.DoomBuilder.Data;
-using System.IO;
-using System.Diagnostics;
-using System.Windows.Forms;
 using CodeImp.DoomBuilder.Compilers;
 
 #endregion
diff --git a/Source/Core/Config/PasteOptions.cs b/Source/Core/Config/PasteOptions.cs
index 4cdb91b598a80c8d19720a664941eb7f9d3e1324..b666cf02151251b7fdcde9b28397736104b8da63 100644
--- a/Source/Core/Config/PasteOptions.cs
+++ b/Source/Core/Config/PasteOptions.cs
@@ -16,17 +16,7 @@
 
 #region ================== Namespaces
 
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Text;
 using CodeImp.DoomBuilder.IO;
-using CodeImp.DoomBuilder.Data;
-using System.IO;
-using System.Diagnostics;
-using System.Windows.Forms;
-using CodeImp.DoomBuilder.Compilers;
 
 #endregion
 
diff --git a/Source/Core/Config/ProgramConfiguration.cs b/Source/Core/Config/ProgramConfiguration.cs
index 0b0d589f893373cef44b3ccaa35bfc76263a1708..617231581341a58decbf65f07b4a19e8e3dafbdb 100644
--- a/Source/Core/Config/ProgramConfiguration.cs
+++ b/Source/Core/Config/ProgramConfiguration.cs
@@ -19,17 +19,12 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
-using System.Globalization;
-using System.Text;
 using CodeImp.DoomBuilder.IO;
-using CodeImp.DoomBuilder.Data;
 using System.IO;
-using System.Diagnostics;
 using System.Windows.Forms;
 using CodeImp.DoomBuilder.Map;
 using System.Reflection;
 using CodeImp.DoomBuilder.Plugins;
-using CodeImp.DoomBuilder.Editing;
 using CodeImp.DoomBuilder.Rendering;
 
 #endregion
diff --git a/Source/Core/Config/ResourceTextureSet.cs b/Source/Core/Config/ResourceTextureSet.cs
index 338bf70ed284df851a9094a5452d84d286c371a3..ca3538402ba62959e8f1c2bfc606c9f5e89b8eb0 100644
--- a/Source/Core/Config/ResourceTextureSet.cs
+++ b/Source/Core/Config/ResourceTextureSet.cs
@@ -16,18 +16,8 @@
 
 #region ================== Namespaces
 
-using System;
-using System.Collections;
 using System.Collections.Generic;
-using System.Globalization;
-using System.Text;
-using CodeImp.DoomBuilder.IO;
 using CodeImp.DoomBuilder.Data;
-using System.IO;
-using System.Diagnostics;
-using System.Windows.Forms;
-using System.Text.RegularExpressions;
-using System.Collections.Specialized;
 
 #endregion
 
diff --git a/Source/Core/Config/ScriptConfiguration.cs b/Source/Core/Config/ScriptConfiguration.cs
index 084168d3de12e06f2aba2cd97ea3d13d526cc3af..b97020dc37c89b4886d74817833806bd62beb0c4 100644
--- a/Source/Core/Config/ScriptConfiguration.cs
+++ b/Source/Core/Config/ScriptConfiguration.cs
@@ -19,15 +19,7 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
-using System.Globalization;
-using System.Text;
 using CodeImp.DoomBuilder.IO;
-using CodeImp.DoomBuilder.Data;
-using System.IO;
-using System.Diagnostics;
-using System.Windows.Forms;
-using CodeImp.DoomBuilder.Map;
-using System.Collections.ObjectModel;
 
 #endregion
 
diff --git a/Source/Core/Config/SectorEffectInfo.cs b/Source/Core/Config/SectorEffectInfo.cs
index 29d7822f83297f9c5652cc4e3d9dc2a7df1ba6a0..96da92bf20533b73087d96d9f02e57ef3361f852 100644
--- a/Source/Core/Config/SectorEffectInfo.cs
+++ b/Source/Core/Config/SectorEffectInfo.cs
@@ -17,16 +17,6 @@
 #region ================== Namespaces
 
 using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Text;
-using CodeImp.DoomBuilder.IO;
-using CodeImp.DoomBuilder.Data;
-using System.IO;
-using System.Diagnostics;
-using System.Windows.Forms;
-using CodeImp.DoomBuilder.Map;
 
 #endregion
 
diff --git a/Source/Core/Config/SkillInfo.cs b/Source/Core/Config/SkillInfo.cs
index 806c6cfb7d79ca29fc285ef5774708902797832e..bc0e5672b969bc3bff6c0c53fe495783ca124b98 100644
--- a/Source/Core/Config/SkillInfo.cs
+++ b/Source/Core/Config/SkillInfo.cs
@@ -17,16 +17,6 @@
 #region ================== Namespaces
 
 using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Text;
-using CodeImp.DoomBuilder.IO;
-using CodeImp.DoomBuilder.Data;
-using System.IO;
-using System.Diagnostics;
-using System.Windows.Forms;
-using CodeImp.DoomBuilder.Map;
 
 #endregion
 
diff --git a/Source/Core/Config/TagType.cs b/Source/Core/Config/TagType.cs
index 38ef313d868bfc7a118826dc8d256e5765a7dfe7..a029b8a226281392d801c472e1c7373467fc3bc9 100644
--- a/Source/Core/Config/TagType.cs
+++ b/Source/Core/Config/TagType.cs
@@ -16,17 +16,6 @@
 
 #region ================== Namespaces
 
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Text;
-using CodeImp.DoomBuilder.IO;
-using CodeImp.DoomBuilder.Data;
-using System.IO;
-using System.Diagnostics;
-using System.Windows.Forms;
-
 #endregion
 
 namespace CodeImp.DoomBuilder.Config
diff --git a/Source/Core/Config/TextureSet.cs b/Source/Core/Config/TextureSet.cs
index d6d60abf646b900affcd642b7d0745f9d03a24e3..5c5acd848c215034d937be3364a17b16e0e7dd79 100644
--- a/Source/Core/Config/TextureSet.cs
+++ b/Source/Core/Config/TextureSet.cs
@@ -17,17 +17,7 @@
 #region ================== Namespaces
 
 using System;
-using System.Collections;
 using System.Collections.Generic;
-using System.Globalization;
-using System.Text;
-using CodeImp.DoomBuilder.IO;
-using CodeImp.DoomBuilder.Data;
-using System.IO;
-using System.Diagnostics;
-using System.Windows.Forms;
-using System.Text.RegularExpressions;
-using System.Collections.Specialized;
 
 #endregion
 
diff --git a/Source/Core/Config/ThingCategory.cs b/Source/Core/Config/ThingCategory.cs
index 082bd9e2c53895f709a9af293ae8bf5228eab2e3..b7e111bc6a634c9f711f2d8aed3229454fe833f5 100644
--- a/Source/Core/Config/ThingCategory.cs
+++ b/Source/Core/Config/ThingCategory.cs
@@ -20,13 +20,7 @@ using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Globalization;
-using System.Text;
 using CodeImp.DoomBuilder.IO;
-using CodeImp.DoomBuilder.Data;
-using System.IO;
-using System.Diagnostics;
-using System.Windows.Forms;
-using CodeImp.DoomBuilder.Rendering;
 
 #endregion
 
diff --git a/Source/Core/Config/ThingTypeInfo.cs b/Source/Core/Config/ThingTypeInfo.cs
index b25913349cf18cb3cc1af343888e7a1d1d0777f9..e4e76bc8d8f839361ea1e2b9d62664757ccd9c96 100644
--- a/Source/Core/Config/ThingTypeInfo.cs
+++ b/Source/Core/Config/ThingTypeInfo.cs
@@ -17,15 +17,10 @@
 #region ================== Namespaces
 
 using System;
-using System.Collections;
 using System.Collections.Generic;
 using System.Globalization;
-using System.Text;
 using CodeImp.DoomBuilder.IO;
 using CodeImp.DoomBuilder.Data;
-using System.IO;
-using System.Diagnostics;
-using System.Windows.Forms;
 using CodeImp.DoomBuilder.ZDoom;
 using CodeImp.DoomBuilder.Map;
 using System.Drawing;
diff --git a/Source/Core/Config/ThingsFlagsCompare.cs b/Source/Core/Config/ThingsFlagsCompare.cs
index 15870c4b38336e533e6d7764ad53fa45fa4fb202..1c6bce4d4b2662eb1fe97a1a6b7f30de62b23ca5 100644
--- a/Source/Core/Config/ThingsFlagsCompare.cs
+++ b/Source/Core/Config/ThingsFlagsCompare.cs
@@ -17,16 +17,7 @@
 #region ================== Namespaces
 
 using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Text;
 using CodeImp.DoomBuilder.IO;
-using CodeImp.DoomBuilder.Data;
-using System.IO;
-using System.Diagnostics;
-using System.Windows.Forms;
-using CodeImp.DoomBuilder.Rendering;
 using CodeImp.DoomBuilder.Map;
 
 #endregion
diff --git a/Source/Core/Config/UniversalFieldInfo.cs b/Source/Core/Config/UniversalFieldInfo.cs
index c531054c707225b1561e1618897612bc46938177..da96162391df5d9e31cc13e6e726bf3f47defac0 100644
--- a/Source/Core/Config/UniversalFieldInfo.cs
+++ b/Source/Core/Config/UniversalFieldInfo.cs
@@ -19,14 +19,7 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
-using System.Globalization;
-using System.Text;
 using CodeImp.DoomBuilder.IO;
-using CodeImp.DoomBuilder.Data;
-using System.IO;
-using System.Diagnostics;
-using System.Windows.Forms;
-using CodeImp.DoomBuilder.Map;
 
 #endregion
 
diff --git a/Source/Core/Controls/ActionSelectorControl.cs b/Source/Core/Controls/ActionSelectorControl.cs
index 5a5d17cb5942cedf33c9850a0af32347bbab22f3..e941858d8e0c90dd4b42cf4cde0311ddf14388e5 100644
--- a/Source/Core/Controls/ActionSelectorControl.cs
+++ b/Source/Core/Controls/ActionSelectorControl.cs
@@ -18,12 +18,8 @@
 
 using System;
 using System.Collections.Generic;
-using System.ComponentModel;
 using System.Drawing;
-using System.Text;
 using System.Windows.Forms;
-using Microsoft.Win32;
-using System.Drawing.Drawing2D;
 using CodeImp.DoomBuilder.Config;
 
 #endregion
diff --git a/Source/Core/Controls/AngleControl.cs b/Source/Core/Controls/AngleControl.cs
index 999b1af3001b77cee7261f2094f618c6fc5b4728..960711750ce835624df1f9bd5455ce0866a7966a 100644
--- a/Source/Core/Controls/AngleControl.cs
+++ b/Source/Core/Controls/AngleControl.cs
@@ -17,16 +17,9 @@
 #region ================== Namespaces
 
 using System;
-using System.Collections.Generic;
-using System.ComponentModel;
 using System.Drawing;
-using System.Text;
-using System.Globalization;
 using System.Windows.Forms;
-using CodeImp.DoomBuilder.Actions;
 using CodeImp.DoomBuilder.Geometry;
-using CodeImp.DoomBuilder.Rendering;
-using CodeImp.DoomBuilder.Editing;
 using System.Drawing.Drawing2D;
 
 #endregion
diff --git a/Source/Core/Controls/ArgumentBox.cs b/Source/Core/Controls/ArgumentBox.cs
index 128d233e70531bec3a28a37469a5b05e3dec526a..f5e591baa8fbcb05f1672b1ae3c4478ff69fb2de 100644
--- a/Source/Core/Controls/ArgumentBox.cs
+++ b/Source/Core/Controls/ArgumentBox.cs
@@ -19,12 +19,8 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
-using System.Drawing;
-using System.Text;
 using System.Windows.Forms;
-using Microsoft.Win32;
 using CodeImp.DoomBuilder.Config;
-using CodeImp.DoomBuilder.Rendering;
 using CodeImp.DoomBuilder.Types;
 using System.Globalization;
 using CodeImp.DoomBuilder.GZBuilder.Controls;
diff --git a/Source/Core/Controls/AutoSelectTextbox.cs b/Source/Core/Controls/AutoSelectTextbox.cs
index f0507db95f916667603343bc06adf3879ce685c8..b18e3d77d18b496ec672f25eb30974f62e7948d4 100644
--- a/Source/Core/Controls/AutoSelectTextbox.cs
+++ b/Source/Core/Controls/AutoSelectTextbox.cs
@@ -17,16 +17,7 @@
 #region ================== Namespaces
 
 using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Drawing;
-using System.Text;
-using System.Globalization;
 using System.Windows.Forms;
-using CodeImp.DoomBuilder.Actions;
-using CodeImp.DoomBuilder.Geometry;
-using CodeImp.DoomBuilder.Rendering;
-using CodeImp.DoomBuilder.Editing;
 
 #endregion
 
diff --git a/Source/Core/Controls/ButtonsNumericTextbox.cs b/Source/Core/Controls/ButtonsNumericTextbox.cs
index a2111aa883fcdaccf251d9422d4572c315e7270b..6a57e1a3457c6b63208b473556dfe28899cc9e26 100644
--- a/Source/Core/Controls/ButtonsNumericTextbox.cs
+++ b/Source/Core/Controls/ButtonsNumericTextbox.cs
@@ -17,16 +17,8 @@
 #region ================== Namespaces
 
 using System;
-using System.Collections.Generic;
 using System.ComponentModel;
-using System.Drawing;
-using System.Text;
-using System.Globalization;
 using System.Windows.Forms;
-using CodeImp.DoomBuilder.Actions;
-using CodeImp.DoomBuilder.Geometry;
-using CodeImp.DoomBuilder.Rendering;
-using CodeImp.DoomBuilder.Editing;
 
 #endregion
 
diff --git a/Source/Core/Controls/ButtonsNumericTextboxDesigner.cs b/Source/Core/Controls/ButtonsNumericTextboxDesigner.cs
index efb2d2e6aa9b2187ea67bd296692f8f57a9474ee..f59e4b4bb05e4ba66efa0056bc2c664f5a98e45f 100644
--- a/Source/Core/Controls/ButtonsNumericTextboxDesigner.cs
+++ b/Source/Core/Controls/ButtonsNumericTextboxDesigner.cs
@@ -16,20 +16,10 @@
 
 #region ================== Namespaces
 
-using System;
 using System.Collections;
-using System.Collections.Generic;
 using System.ComponentModel;
 using System.ComponentModel.Design;
-using System.Drawing;
-using System.Text;
-using System.Globalization;
-using System.Windows.Forms;
 using System.Windows.Forms.Design.Behavior;
-using CodeImp.DoomBuilder.Actions;
-using CodeImp.DoomBuilder.Geometry;
-using CodeImp.DoomBuilder.Rendering;
-using CodeImp.DoomBuilder.Editing;
 using System.Windows.Forms.Design;
 
 #endregion
diff --git a/Source/Core/Controls/CheckboxArrayControl.cs b/Source/Core/Controls/CheckboxArrayControl.cs
index 933535c805ca5898ff45af09abd4aa5ee0cd09b5..0077331db47e03d3240f49919dd72add1b23726f 100644
--- a/Source/Core/Controls/CheckboxArrayControl.cs
+++ b/Source/Core/Controls/CheckboxArrayControl.cs
@@ -18,11 +18,8 @@
 
 using System;
 using System.Collections.Generic;
-using System.ComponentModel;
 using System.Drawing;
-using System.Text;
 using System.Windows.Forms;
-using Microsoft.Win32;
 using System.Drawing.Drawing2D;
 
 #endregion
diff --git a/Source/Core/Controls/ColorControl.cs b/Source/Core/Controls/ColorControl.cs
index 1d4c155fbd28001b31f65fec6f23817089e59ebd..8fa19e4733c188de9575e34c73739f4a4ca7e66b 100644
--- a/Source/Core/Controls/ColorControl.cs
+++ b/Source/Core/Controls/ColorControl.cs
@@ -17,13 +17,7 @@
 #region ================== Namespaces
 
 using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Drawing;
-using System.Text;
 using System.Windows.Forms;
-using Microsoft.Win32;
-using CodeImp.DoomBuilder.Config;
 using CodeImp.DoomBuilder.Rendering;
 
 #endregion
diff --git a/Source/Core/Controls/Docker.cs b/Source/Core/Controls/Docker.cs
index 79cce080b3a0b74db7ec67e9f2b432ac89284ee0..52e5178d0223661ddaddd64f64f1b44eb9a3216c 100644
--- a/Source/Core/Controls/Docker.cs
+++ b/Source/Core/Controls/Docker.cs
@@ -16,22 +16,7 @@
 
 #region ================== Namespaces
 
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Drawing;
-using System.Text;
 using System.Windows.Forms;
-using Microsoft.Win32;
-using System.Diagnostics;
-using CodeImp.DoomBuilder.Actions;
-using CodeImp.DoomBuilder.Data;
-using CodeImp.DoomBuilder.Config;
-using CodeImp.DoomBuilder.Rendering;
-using System.Drawing.Imaging;
-using System.Drawing.Drawing2D;
-using SlimDX.Direct3D9;
-using SlimDX;
 
 #endregion
 
diff --git a/Source/Core/Controls/DockersControl.cs b/Source/Core/Controls/DockersControl.cs
index f81ab15ab84ae92fb86aedb4772261686feceaf1..eefae1ff2ba843211a5076318df7f8a201c46081 100644
--- a/Source/Core/Controls/DockersControl.cs
+++ b/Source/Core/Controls/DockersControl.cs
@@ -18,21 +18,8 @@
 
 using System;
 using System.Collections.Generic;
-using System.ComponentModel;
 using System.Drawing;
-using System.Text;
 using System.Windows.Forms;
-using Microsoft.Win32;
-using System.Diagnostics;
-using CodeImp.DoomBuilder.Actions;
-using CodeImp.DoomBuilder.Data;
-using CodeImp.DoomBuilder.Config;
-using CodeImp.DoomBuilder.Rendering;
-using SlimDX.Direct3D9;
-using System.Drawing.Imaging;
-using System.Drawing.Drawing2D;
-using CodeImp.DoomBuilder.Map;
-using System.Globalization;
 
 #endregion
 
diff --git a/Source/Core/Controls/DockersTabsControl.cs b/Source/Core/Controls/DockersTabsControl.cs
index e4330bd897f7c48416e8566d63113750b09e48f4..76f5eade96ab043eb6f7c414be91c28fdb1e2ffd 100644
--- a/Source/Core/Controls/DockersTabsControl.cs
+++ b/Source/Core/Controls/DockersTabsControl.cs
@@ -17,23 +17,10 @@
 #region ================== Namespaces
 
 using System;
-using System.Collections.Generic;
-using System.ComponentModel;
 using System.Drawing;
-using System.Text;
 using System.Windows.Forms;
 using System.Windows.Forms.VisualStyles;
-using Microsoft.Win32;
-using System.Diagnostics;
-using CodeImp.DoomBuilder.Actions;
-using CodeImp.DoomBuilder.Data;
-using CodeImp.DoomBuilder.Config;
-using CodeImp.DoomBuilder.Rendering;
-using SlimDX.Direct3D9;
 using System.Drawing.Imaging;
-using System.Drawing.Drawing2D;
-using CodeImp.DoomBuilder.Map;
-using CodeImp.DoomBuilder.Types;
 using System.Drawing.Text;
 
 #endregion
diff --git a/Source/Core/Controls/FieldsEditorControl.cs b/Source/Core/Controls/FieldsEditorControl.cs
index 59c4acd7d6d9b707b66c2bd05d37bd8ac6314925..bae70e2f797d3ccf1623348686a9b7a9cd0f00da 100644
--- a/Source/Core/Controls/FieldsEditorControl.cs
+++ b/Source/Core/Controls/FieldsEditorControl.cs
@@ -20,17 +20,8 @@ using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Drawing;
-using System.Text;
 using System.Windows.Forms;
-using Microsoft.Win32;
-using System.Diagnostics;
-using CodeImp.DoomBuilder.Actions;
-using CodeImp.DoomBuilder.Data;
 using CodeImp.DoomBuilder.Config;
-using CodeImp.DoomBuilder.Rendering;
-using SlimDX.Direct3D9;
-using System.Drawing.Imaging;
-using System.Drawing.Drawing2D;
 using CodeImp.DoomBuilder.Map;
 using System.Globalization;
 using CodeImp.DoomBuilder.Types;
diff --git a/Source/Core/Controls/FieldsEditorRow.cs b/Source/Core/Controls/FieldsEditorRow.cs
index db029a9a76daccce6369f85c74f348a6b063f7bd..49be3feaca61c71de8a8ecbaab4f085c2da07b56 100644
--- a/Source/Core/Controls/FieldsEditorRow.cs
+++ b/Source/Core/Controls/FieldsEditorRow.cs
@@ -17,21 +17,9 @@
 #region ================== Namespaces
 
 using System;
-using System.Collections.Generic;
-using System.ComponentModel;
 using System.Drawing;
-using System.Text;
 using System.Windows.Forms;
-using Microsoft.Win32;
-using System.Diagnostics;
-using CodeImp.DoomBuilder.Actions;
-using CodeImp.DoomBuilder.Data;
 using CodeImp.DoomBuilder.Config;
-using CodeImp.DoomBuilder.Rendering;
-using SlimDX.Direct3D9;
-using System.Drawing.Imaging;
-using System.Drawing.Drawing2D;
-using CodeImp.DoomBuilder.Map;
 using CodeImp.DoomBuilder.Types;
 
 #endregion
diff --git a/Source/Core/Controls/FlatSelectorControl.cs b/Source/Core/Controls/FlatSelectorControl.cs
index 78b7be984108a8240542202dfecff77f14d43f53..5381e7e9bc0dfc97472c6d3832bd6ca4c9372dfd 100644
--- a/Source/Core/Controls/FlatSelectorControl.cs
+++ b/Source/Core/Controls/FlatSelectorControl.cs
@@ -16,22 +16,7 @@
 
 #region ================== Namespaces
 
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
 using System.Drawing;
-using System.Text;
-using System.Windows.Forms;
-using Microsoft.Win32;
-using System.Diagnostics;
-using CodeImp.DoomBuilder.Actions;
-using CodeImp.DoomBuilder.Data;
-using CodeImp.DoomBuilder.Config;
-using CodeImp.DoomBuilder.Rendering;
-using SlimDX.Direct3D9;
-using System.Drawing.Imaging;
-using System.Drawing.Drawing2D;
-using CodeImp.DoomBuilder.Map;
 using CodeImp.DoomBuilder.Windows;
 
 #endregion
diff --git a/Source/Core/Controls/ImageBrowserControl.cs b/Source/Core/Controls/ImageBrowserControl.cs
index 246c34d382eeb8029b514e31b230d0b3b0c06a27..5fa89484c8c33d7e069df0c3f59ea13cae63c8fa 100644
--- a/Source/Core/Controls/ImageBrowserControl.cs
+++ b/Source/Core/Controls/ImageBrowserControl.cs
@@ -18,19 +18,9 @@
 
 using System;
 using System.Collections.Generic;
-using System.ComponentModel;
 using System.Drawing;
-using System.Text;
 using System.Windows.Forms;
-using Microsoft.Win32;
-using System.Diagnostics;
-using CodeImp.DoomBuilder.Actions;
 using CodeImp.DoomBuilder.Data;
-using CodeImp.DoomBuilder.Config;
-using CodeImp.DoomBuilder.Rendering;
-using SlimDX.Direct3D9;
-using System.Drawing.Imaging;
-using System.Drawing.Drawing2D;
 
 #endregion
 
diff --git a/Source/Core/Controls/ImageBrowserItem.cs b/Source/Core/Controls/ImageBrowserItem.cs
index 86ba1053422a2596d22415d141638639def6bd90..360671d1e89443a9aa138b3bc85ee9f4f69ed6c0 100644
--- a/Source/Core/Controls/ImageBrowserItem.cs
+++ b/Source/Core/Controls/ImageBrowserItem.cs
@@ -17,20 +17,10 @@
 #region ================== Namespaces
 
 using System;
-using System.Collections.Generic;
-using System.ComponentModel;
 using System.Drawing;
-using System.Text;
 using System.Windows.Forms;
-using Microsoft.Win32;
-using System.Diagnostics;
-using CodeImp.DoomBuilder.Actions;
 using CodeImp.DoomBuilder.Data;
-using CodeImp.DoomBuilder.Config;
-using CodeImp.DoomBuilder.Rendering;
-using System.Drawing.Imaging;
 using System.Drawing.Drawing2D;
-using SlimDX.Direct3D9;
 using SlimDX;
 
 #endregion
diff --git a/Source/Core/Controls/ImageSelectorControl.cs b/Source/Core/Controls/ImageSelectorControl.cs
index f4df43585db74b5327a3ef124232ae9c2f7d12fe..7d3ddb713b9510ed526625b0ba74dcfbcce15e05 100644
--- a/Source/Core/Controls/ImageSelectorControl.cs
+++ b/Source/Core/Controls/ImageSelectorControl.cs
@@ -17,21 +17,9 @@
 #region ================== Namespaces
 
 using System;
-using System.Collections.Generic;
-using System.ComponentModel;
 using System.Drawing;
-using System.Text;
 using System.Windows.Forms;
-using Microsoft.Win32;
-using System.Diagnostics;
-using CodeImp.DoomBuilder.Actions;
-using CodeImp.DoomBuilder.Data;
-using CodeImp.DoomBuilder.Config;
-using CodeImp.DoomBuilder.Rendering;
 using SlimDX;
-using SlimDX.Direct3D9;
-using System.Drawing.Imaging;
-using System.Drawing.Drawing2D;
 
 #endregion
 
diff --git a/Source/Core/Controls/LinedefInfoPanel.cs b/Source/Core/Controls/LinedefInfoPanel.cs
index 42bf4d30101ccec3194d215036a5b34214895c58..4e1ac7ca66aa9d70b7761b9562e93584e744fff2 100644
--- a/Source/Core/Controls/LinedefInfoPanel.cs
+++ b/Source/Core/Controls/LinedefInfoPanel.cs
@@ -18,17 +18,10 @@
 
 using System;
 using System.Collections.Generic;
-using System.ComponentModel;
-using System.Drawing;
-using System.Text;
 using System.Windows.Forms;
-using Microsoft.Win32;
-using System.Diagnostics;
-using CodeImp.DoomBuilder.Data;
 using CodeImp.DoomBuilder.Map;
 using CodeImp.DoomBuilder.Config;
 using CodeImp.DoomBuilder.Types;
-using CodeImp.DoomBuilder.IO;
 using CodeImp.DoomBuilder.GZBuilder;
 
 #endregion
diff --git a/Source/Core/Controls/NumericTextbox.cs b/Source/Core/Controls/NumericTextbox.cs
index 610dfb2d699ab6898e1bf3a862783fce3ed04d63..7b53f812d6ae095dad6d239ac1dc670d36a87082 100644
--- a/Source/Core/Controls/NumericTextbox.cs
+++ b/Source/Core/Controls/NumericTextbox.cs
@@ -16,17 +16,9 @@
 
 #region ================== Namespaces
 
-using System;
-using System.Collections.Generic;
 using System.ComponentModel;
-using System.Drawing;
-using System.Text;
 using System.Globalization;
 using System.Windows.Forms;
-using CodeImp.DoomBuilder.Actions;
-using CodeImp.DoomBuilder.Geometry;
-using CodeImp.DoomBuilder.Rendering;
-using CodeImp.DoomBuilder.Editing;
 
 #endregion
 
diff --git a/Source/Core/Controls/OptimizedListView.cs b/Source/Core/Controls/OptimizedListView.cs
index a1aea48a03d29863aa28594a812df242f0c8fad2..057d7f82098bd93395ce121f21a853cac4395d98 100644
--- a/Source/Core/Controls/OptimizedListView.cs
+++ b/Source/Core/Controls/OptimizedListView.cs
@@ -16,17 +16,7 @@
 
 #region ================== Namespaces
 
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Drawing;
-using System.Text;
-using System.Globalization;
 using System.Windows.Forms;
-using CodeImp.DoomBuilder.Actions;
-using CodeImp.DoomBuilder.Geometry;
-using CodeImp.DoomBuilder.Rendering;
-using CodeImp.DoomBuilder.Editing;
 
 #endregion
 
diff --git a/Source/Core/Controls/PasteOptionsControl.cs b/Source/Core/Controls/PasteOptionsControl.cs
index 5a84437ab2fe6a358740397789207456e089799f..d82666b2d319c2bf1d47e68f2bd3aabbcca702be 100644
--- a/Source/Core/Controls/PasteOptionsControl.cs
+++ b/Source/Core/Controls/PasteOptionsControl.cs
@@ -16,15 +16,7 @@
 
 #region ================== Namespaces
 
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Drawing;
-using System.Text;
-using System.Globalization;
 using System.Windows.Forms;
-using CodeImp.DoomBuilder.Data;
-using CodeImp.DoomBuilder.Windows;
 using CodeImp.DoomBuilder.Config;
 
 #endregion
diff --git a/Source/Core/Controls/RenderTargetControl.cs b/Source/Core/Controls/RenderTargetControl.cs
index be50738e730c180ceae35b6a9e1ba7f92b61211c..01cd0ccd021ac0f8a7e4391cfd68c06b6c9ed0d8 100644
--- a/Source/Core/Controls/RenderTargetControl.cs
+++ b/Source/Core/Controls/RenderTargetControl.cs
@@ -16,17 +16,8 @@
 
 #region ================== Namespaces
 
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
 using System.Drawing;
-using System.Text;
-using System.Globalization;
 using System.Windows.Forms;
-using CodeImp.DoomBuilder.Actions;
-using CodeImp.DoomBuilder.Geometry;
-using CodeImp.DoomBuilder.Rendering;
-using CodeImp.DoomBuilder.Editing;
 
 #endregion
 
diff --git a/Source/Core/Controls/ResourceListEditor.cs b/Source/Core/Controls/ResourceListEditor.cs
index 9916523b4120d540e1fc3d99905267d7698cd24d..be1ad58431a04fc2618b8e51608405aa5dcab5b2 100644
--- a/Source/Core/Controls/ResourceListEditor.cs
+++ b/Source/Core/Controls/ResourceListEditor.cs
@@ -17,11 +17,7 @@
 #region ================== Namespaces
 
 using System;
-using System.Collections.Generic;
-using System.ComponentModel;
 using System.Drawing;
-using System.Text;
-using System.Globalization;
 using System.Windows.Forms;
 using CodeImp.DoomBuilder.Data;
 using CodeImp.DoomBuilder.Windows;
diff --git a/Source/Core/Controls/ResourceListView.cs b/Source/Core/Controls/ResourceListView.cs
index 892cde9b125e4af8d40a3cce41acfb769cffbd87..f5797d08963105516e48edacb17dd72d55b13e78 100644
--- a/Source/Core/Controls/ResourceListView.cs
+++ b/Source/Core/Controls/ResourceListView.cs
@@ -18,15 +18,8 @@
 
 using System;
 using System.Collections.Generic;
-using System.ComponentModel;
 using System.Drawing;
-using System.Text;
-using System.Globalization;
 using System.Windows.Forms;
-using CodeImp.DoomBuilder.Actions;
-using CodeImp.DoomBuilder.Geometry;
-using CodeImp.DoomBuilder.Rendering;
-using CodeImp.DoomBuilder.Editing;
 
 #endregion
 
diff --git a/Source/Core/Controls/ScintillaConstants.cs b/Source/Core/Controls/ScintillaConstants.cs
index 025dd7900826f6b30109bde42e82eaea4c47ac2b..fbefc4b63e20e93fbdfa279d00c0be4262a244f2 100644
--- a/Source/Core/Controls/ScintillaConstants.cs
+++ b/Source/Core/Controls/ScintillaConstants.cs
@@ -17,15 +17,6 @@
 #region ================== Namespaces
 
 using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Drawing;
-using System.Text;
-using System.Windows.Forms;
-using Microsoft.Win32;
-using System.Diagnostics;
-using CodeImp.DoomBuilder.Data;
-using CodeImp.DoomBuilder.Map;
 
 #endregion
 
diff --git a/Source/Core/Controls/ScintillaControl.cs b/Source/Core/Controls/ScintillaControl.cs
index 644d205ac3736781f331faaac3b10eebead1d198..4f8f040b9a1c146c5db8e234f8868319deec3844 100644
--- a/Source/Core/Controls/ScintillaControl.cs
+++ b/Source/Core/Controls/ScintillaControl.cs
@@ -18,14 +18,8 @@
 
 using System;
 using System.Collections.Generic;
-using System.ComponentModel;
 using System.Drawing;
-using System.Text;
 using System.Windows.Forms;
-using Microsoft.Win32;
-using System.Diagnostics;
-using CodeImp.DoomBuilder.Data;
-using CodeImp.DoomBuilder.Map;
 using System.Runtime.InteropServices;
 
 #endregion
diff --git a/Source/Core/Controls/ScriptDocumentTab.cs b/Source/Core/Controls/ScriptDocumentTab.cs
index 6fa4f415049b7cf24226bfe2a00d89156685043f..912ec28ce5176f1fa84d5a7197b1482f39a6dc92 100644
--- a/Source/Core/Controls/ScriptDocumentTab.cs
+++ b/Source/Core/Controls/ScriptDocumentTab.cs
@@ -19,18 +19,11 @@
 using System;
 using System.IO;
 using System.Collections.Generic;
-using System.ComponentModel;
 using System.Drawing;
 using System.Text;
 using System.Windows.Forms;
 using CodeImp.DoomBuilder.Windows;
-using Microsoft.Win32;
-using System.Diagnostics;
-using CodeImp.DoomBuilder.Data;
-using CodeImp.DoomBuilder.Map;
 using CodeImp.DoomBuilder.Config;
-using CodeImp.DoomBuilder.Types;
-using CodeImp.DoomBuilder.IO;
 using CodeImp.DoomBuilder.Compilers;
 //mxd
 using CodeImp.DoomBuilder.GZBuilder.Data;
diff --git a/Source/Core/Controls/ScriptEditorControl.cs b/Source/Core/Controls/ScriptEditorControl.cs
index dd099b3bb3324196b774b5823fcbf797487bcd00..6b8143252757a625f32fc9fff3a728354ce5fa69 100644
--- a/Source/Core/Controls/ScriptEditorControl.cs
+++ b/Source/Core/Controls/ScriptEditorControl.cs
@@ -18,15 +18,10 @@
 
 using System;
 using System.Collections.Generic;
-using System.ComponentModel;
-using System.Drawing;
 using System.Text;
 using System.Windows.Forms;
-using Microsoft.Win32;
-using System.Drawing.Drawing2D;
 using CodeImp.DoomBuilder.Config;
 using System.IO;
-using System.Reflection;
 using CodeImp.DoomBuilder.IO;
 using System.Collections;
 using System.Globalization;
diff --git a/Source/Core/Controls/ScriptEditorPanel.cs b/Source/Core/Controls/ScriptEditorPanel.cs
index fb53f37d65f7985917b969ec8f506770f90e12ff..22a2fa3d100d77a8e211b50c831701225814812a 100644
--- a/Source/Core/Controls/ScriptEditorPanel.cs
+++ b/Source/Core/Controls/ScriptEditorPanel.cs
@@ -18,18 +18,9 @@
 
 using System;
 using System.Collections.Generic;
-using System.ComponentModel;
-using System.Drawing;
-using System.Text;
 using System.Windows.Forms;
 using CodeImp.DoomBuilder.Windows;
-using Microsoft.Win32;
-using System.Diagnostics;
-using CodeImp.DoomBuilder.Data;
-using CodeImp.DoomBuilder.Map;
 using CodeImp.DoomBuilder.Config;
-using CodeImp.DoomBuilder.Types;
-using CodeImp.DoomBuilder.IO;
 using System.Globalization;
 using System.IO;
 using CodeImp.DoomBuilder.Compilers;
diff --git a/Source/Core/Controls/ScriptFileDocumentTab.cs b/Source/Core/Controls/ScriptFileDocumentTab.cs
index 467212509ebd3d82c7fcd8f11dd6f3b179c06e26..8e38f7df1494e6920a6018e100874014ac02f306 100644
--- a/Source/Core/Controls/ScriptFileDocumentTab.cs
+++ b/Source/Core/Controls/ScriptFileDocumentTab.cs
@@ -18,22 +18,11 @@
 
 using System;
 using System.Collections.Generic;
-using System.ComponentModel;
-using System.Drawing;
-using System.Text;
 using System.Windows.Forms;
-using Microsoft.Win32;
-using System.Diagnostics;
-using CodeImp.DoomBuilder.Data;
-using CodeImp.DoomBuilder.Map;
 using CodeImp.DoomBuilder.Config;
-using CodeImp.DoomBuilder.Types;
-using CodeImp.DoomBuilder.IO;
 using System.IO;
 using CodeImp.DoomBuilder.Compilers;
-//mxd
-using CodeImp.DoomBuilder.GZBuilder.Data;
-using CodeImp.DoomBuilder.GZBuilder.GZDoom;
+using CodeImp.DoomBuilder.GZBuilder.Data; //mxd
 
 #endregion
 
diff --git a/Source/Core/Controls/ScriptLumpDocumentTab.cs b/Source/Core/Controls/ScriptLumpDocumentTab.cs
index 34f412f674916681f4e859aaf28a78c0d83cd447..247494c1447f233d1c159a12ce6566ca3114bcfc 100644
--- a/Source/Core/Controls/ScriptLumpDocumentTab.cs
+++ b/Source/Core/Controls/ScriptLumpDocumentTab.cs
@@ -16,24 +16,10 @@
 
 #region ================== Namespaces
 
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Drawing;
-using System.Globalization;
-using System.Text;
-using System.Windows.Forms;
-using Microsoft.Win32;
-using System.Diagnostics;
-using CodeImp.DoomBuilder.Data;
-using CodeImp.DoomBuilder.Map;
 using CodeImp.DoomBuilder.Config;
-using CodeImp.DoomBuilder.Types;
-using CodeImp.DoomBuilder.IO;
 using System.IO;
 using CodeImp.DoomBuilder.Compilers;
-//mxd
-using CodeImp.DoomBuilder.GZBuilder.Data;
+using CodeImp.DoomBuilder.GZBuilder.Data; //mxd
 
 #endregion
 
diff --git a/Source/Core/Controls/SectorInfoPanel.cs b/Source/Core/Controls/SectorInfoPanel.cs
index e0e4cc817db4b32871d97126e2bb597650cfcf4f..5aa80366da9750555566e802797a771440a421e3 100644
--- a/Source/Core/Controls/SectorInfoPanel.cs
+++ b/Source/Core/Controls/SectorInfoPanel.cs
@@ -17,14 +17,7 @@
 #region ================== Namespaces
 
 using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Drawing;
-using System.Text;
 using System.Windows.Forms;
-using Microsoft.Win32;
-using System.Diagnostics;
-using CodeImp.DoomBuilder.Data;
 using CodeImp.DoomBuilder.Map;
 
 #endregion
diff --git a/Source/Core/Controls/TextureSelectorControl.cs b/Source/Core/Controls/TextureSelectorControl.cs
index 100a6657137393a0c8ae4f3f5d088586e25e7774..8c191b8e75fb4ed175233ca1e97cf3e4e9ce64fe 100644
--- a/Source/Core/Controls/TextureSelectorControl.cs
+++ b/Source/Core/Controls/TextureSelectorControl.cs
@@ -16,22 +16,7 @@
 
 #region ================== Namespaces
 
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
 using System.Drawing;
-using System.Text;
-using System.Windows.Forms;
-using Microsoft.Win32;
-using System.Diagnostics;
-using CodeImp.DoomBuilder.Actions;
-using CodeImp.DoomBuilder.Data;
-using CodeImp.DoomBuilder.Config;
-using CodeImp.DoomBuilder.Rendering;
-using SlimDX.Direct3D9;
-using System.Drawing.Imaging;
-using System.Drawing.Drawing2D;
-using CodeImp.DoomBuilder.Map;
 using CodeImp.DoomBuilder.Windows;
 
 #endregion
diff --git a/Source/Core/Controls/ThingBrowserControl.cs b/Source/Core/Controls/ThingBrowserControl.cs
index 7f13993ca3ff3f64db78059357a16b98922bbb32..77a03136db214e7904e99c180c45fdb775c2d17c 100644
--- a/Source/Core/Controls/ThingBrowserControl.cs
+++ b/Source/Core/Controls/ThingBrowserControl.cs
@@ -18,21 +18,8 @@
 
 using System;
 using System.Collections.Generic;
-using System.ComponentModel;
-using System.Drawing;
-using System.Text;
 using System.Windows.Forms;
-using CodeImp.DoomBuilder.Windows;
-using Microsoft.Win32;
-using System.Diagnostics;
-using CodeImp.DoomBuilder.Data;
-using CodeImp.DoomBuilder.Map;
 using CodeImp.DoomBuilder.Config;
-using CodeImp.DoomBuilder.Types;
-using CodeImp.DoomBuilder.IO;
-using System.Globalization;
-using System.IO;
-using CodeImp.DoomBuilder.Compilers;
 
 #endregion
 
diff --git a/Source/Core/Controls/ThingInfoPanel.cs b/Source/Core/Controls/ThingInfoPanel.cs
index 51400a5517e83c0c77f991581d596bf19f6c6941..9ee19b4d282d6e1590c5a1ebaa2a9f83d67a9bbe 100644
--- a/Source/Core/Controls/ThingInfoPanel.cs
+++ b/Source/Core/Controls/ThingInfoPanel.cs
@@ -17,22 +17,12 @@
 #region ================== Namespaces
 
 using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Drawing;
-using System.Text;
 using System.Windows.Forms;
-using CodeImp.DoomBuilder.Geometry;
-using Microsoft.Win32;
-using System.Diagnostics;
 using CodeImp.DoomBuilder.Data;
 using CodeImp.DoomBuilder.Map;
 using CodeImp.DoomBuilder.Config;
 using CodeImp.DoomBuilder.Types;
-using CodeImp.DoomBuilder.IO;
-//mxd
-using CodeImp.DoomBuilder.GZBuilder.Data;
-using CodeImp.DoomBuilder.GZBuilder;
+using CodeImp.DoomBuilder.GZBuilder; //mxd
 
 #endregion
 
diff --git a/Source/Core/Controls/TransparentPanel.cs b/Source/Core/Controls/TransparentPanel.cs
index 1543f02e76389e069e7f587239e4bf1adde152a9..fdd20a110d6a1468cc4e7901ec7c2c5ec26e9370 100644
--- a/Source/Core/Controls/TransparentPanel.cs
+++ b/Source/Core/Controls/TransparentPanel.cs
@@ -16,17 +16,8 @@
 
 #region ================== Namespaces
 
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
 using System.Drawing;
-using System.Text;
-using System.Globalization;
 using System.Windows.Forms;
-using CodeImp.DoomBuilder.Actions;
-using CodeImp.DoomBuilder.Geometry;
-using CodeImp.DoomBuilder.Rendering;
-using CodeImp.DoomBuilder.Editing;
 
 #endregion
 
diff --git a/Source/Core/Controls/VertexInfoPanel.cs b/Source/Core/Controls/VertexInfoPanel.cs
index 7cac98028b537bb79dd70c26045f1b2a44d6dd13..3783b345e9c68f6d3478d84d7d9f5442e8569b84 100644
--- a/Source/Core/Controls/VertexInfoPanel.cs
+++ b/Source/Core/Controls/VertexInfoPanel.cs
@@ -16,17 +16,8 @@
 
 #region ================== Namespaces
 
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Drawing;
-using System.Text;
 using System.Windows.Forms;
-using Microsoft.Win32;
-using System.Diagnostics;
-using CodeImp.DoomBuilder.Data;
 using CodeImp.DoomBuilder.Map;
-using CodeImp.DoomBuilder.GZBuilder.Tools;
 
 #endregion
 
diff --git a/Source/Core/Data/BitmapImage.cs b/Source/Core/Data/BitmapImage.cs
index da669349b4d289ebfacc82b10a1a05a5d204331f..1fa4e88c44e0cfffa117d95d682857d98938269c 100644
--- a/Source/Core/Data/BitmapImage.cs
+++ b/Source/Core/Data/BitmapImage.cs
@@ -17,16 +17,7 @@
 #region ================== Namespaces
 
 using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Reflection;
-using System.Text;
 using System.Drawing;
-using System.Drawing.Imaging;
-using CodeImp.DoomBuilder.Rendering;
-using CodeImp.DoomBuilder.IO;
-using System.IO;
 
 #endregion
 
diff --git a/Source/Core/Data/ColorImage.cs b/Source/Core/Data/ColorImage.cs
index 366c1787c2cec0f6818b9bfa32fd75e431498c9a..67f09416c484dead872bd8b5d5166c0a4f17c61c 100644
--- a/Source/Core/Data/ColorImage.cs
+++ b/Source/Core/Data/ColorImage.cs
@@ -17,14 +17,8 @@
 #region ================== Namespaces
 
 using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Text;
 using System.Drawing;
 using System.Drawing.Imaging;
-using System.IO;
-using CodeImp.DoomBuilder.IO;
 using CodeImp.DoomBuilder.Rendering;
 
 #endregion
diff --git a/Source/Core/Data/ColormapImage.cs b/Source/Core/Data/ColormapImage.cs
index f10bd6314b20743b10a5d9301aa031c34fdb8b08..f7fc0393037835ce4cb2d0595d355001ae99dfa3 100644
--- a/Source/Core/Data/ColormapImage.cs
+++ b/Source/Core/Data/ColormapImage.cs
@@ -17,12 +17,6 @@
 #region ================== Namespaces
 
 using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Text;
-using System.Drawing;
-using System.Drawing.Imaging;
 using System.IO;
 using CodeImp.DoomBuilder.IO;
 
diff --git a/Source/Core/Data/DataLocation.cs b/Source/Core/Data/DataLocation.cs
index 7f2128b59c4e4b2f7eeda3129fca461419095a2c..500796e8315e9762c51ea4242d35ec610576dd41 100644
--- a/Source/Core/Data/DataLocation.cs
+++ b/Source/Core/Data/DataLocation.cs
@@ -17,10 +17,6 @@
 #region ================== Namespaces
 
 using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Text;
 
 #endregion
 
diff --git a/Source/Core/Data/DataLocationList.cs b/Source/Core/Data/DataLocationList.cs
index 042b522da35e38ddda68aa9b56fc3df78420da9c..c8ea6a6acd98dbf8b4dfed3373ea6cd10f76c357 100644
--- a/Source/Core/Data/DataLocationList.cs
+++ b/Source/Core/Data/DataLocationList.cs
@@ -16,11 +16,9 @@
 
 #region ================== Namespaces
 
-using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Globalization;
-using System.Text;
 using CodeImp.DoomBuilder.IO;
 using System.Collections.Specialized;
 
diff --git a/Source/Core/Data/DataManager.cs b/Source/Core/Data/DataManager.cs
index f2fc99c32abafe788df8212bcbd6b1b4c6461ef5..8a8b61015babd336bf2a899d1f60d5ffe7b10c69 100644
--- a/Source/Core/Data/DataManager.cs
+++ b/Source/Core/Data/DataManager.cs
@@ -19,21 +19,13 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
-using System.Globalization;
-using System.Text;
-using System.Drawing;
-using System.Drawing.Imaging;
 using System.IO;
 using CodeImp.DoomBuilder.IO;
-using System.Windows.Forms;
-using SlimDX.Direct3D9;
 using CodeImp.DoomBuilder.Config;
 using System.Threading;
 using CodeImp.DoomBuilder.Map;
 using CodeImp.DoomBuilder.Windows;
 using CodeImp.DoomBuilder.ZDoom;
-using CodeImp.DoomBuilder.VisualModes;
-
 using CodeImp.DoomBuilder.GZBuilder.Data;
 using CodeImp.DoomBuilder.GZBuilder.GZDoom;
 using CodeImp.DoomBuilder.GZBuilder.MD3;
diff --git a/Source/Core/Data/DataReader.cs b/Source/Core/Data/DataReader.cs
index a46788e258dd11b3f4c49f11d6addf2a811aef18..6b8ba3d4a07015811f4f37cca2a711fb685c3278 100644
--- a/Source/Core/Data/DataReader.cs
+++ b/Source/Core/Data/DataReader.cs
@@ -16,17 +16,9 @@
 
 #region ================== Namespaces
 
-using System;
-using System.Collections;
 using System.Collections.Generic;
-using System.Globalization;
-using System.Text;
-using System.Drawing;
-using System.Drawing.Imaging;
 using System.IO;
 using CodeImp.DoomBuilder.Config;
-using CodeImp.DoomBuilder.IO;
-using CodeImp.DoomBuilder.Rendering;
 using CodeImp.DoomBuilder.GZBuilder.Data;
 
 #endregion
diff --git a/Source/Core/Data/DirectoryReader.cs b/Source/Core/Data/DirectoryReader.cs
index 22782b784ace13f099f72e6a84e730b3b94eaf9f..6e748078a30c3ec272f10e991290b1045a352aae 100644
--- a/Source/Core/Data/DirectoryReader.cs
+++ b/Source/Core/Data/DirectoryReader.cs
@@ -17,14 +17,7 @@
 #region ================== Namespaces
 
 using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Text;
-using System.Drawing;
-using System.Drawing.Imaging;
 using System.IO;
-using System.Windows.Forms;
 using CodeImp.DoomBuilder.IO;
 
 #endregion
diff --git a/Source/Core/Data/DynamicBitmapImage.cs b/Source/Core/Data/DynamicBitmapImage.cs
index a0ffc0a6fa7b81a312b8dcea54e06594a10f7e0a..65fc5d966c21228e61c416f1ff8f9b729026de1b 100644
--- a/Source/Core/Data/DynamicBitmapImage.cs
+++ b/Source/Core/Data/DynamicBitmapImage.cs
@@ -16,17 +16,8 @@
 
 #region ================== Namespaces
 
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Reflection;
-using System.Text;
 using System.Drawing;
-using System.Drawing.Imaging;
 using CodeImp.DoomBuilder.Rendering;
-using CodeImp.DoomBuilder.IO;
-using System.IO;
 
 #endregion
 
diff --git a/Source/Core/Data/FileImage.cs b/Source/Core/Data/FileImage.cs
index 6c46b665f9c4c27a6083f5c7db89fc9d29cda323..a6105dac322917b96d581d3351cf5aa9becca031 100644
--- a/Source/Core/Data/FileImage.cs
+++ b/Source/Core/Data/FileImage.cs
@@ -17,12 +17,6 @@
 #region ================== Namespaces
 
 using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Text;
-using System.Drawing;
-using System.Drawing.Imaging;
 using System.IO;
 using CodeImp.DoomBuilder.IO;
 
diff --git a/Source/Core/Data/FlatImage.cs b/Source/Core/Data/FlatImage.cs
index a4fee5e63474b7d26bbc5ecfd711944b7636fe94..5a6da909bf13fba441e186012e233cfe3b255209 100644
--- a/Source/Core/Data/FlatImage.cs
+++ b/Source/Core/Data/FlatImage.cs
@@ -17,12 +17,6 @@
 #region ================== Namespaces
 
 using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Text;
-using System.Drawing;
-using System.Drawing.Imaging;
 using System.IO;
 using CodeImp.DoomBuilder.IO;
 
diff --git a/Source/Core/Data/HighResImage.cs b/Source/Core/Data/HighResImage.cs
index 96cc1f2a0413a81694dbec1eb20ebc0a508ce3fa..478fac6b90843d7483ceb3f4316e397f36219b40 100644
--- a/Source/Core/Data/HighResImage.cs
+++ b/Source/Core/Data/HighResImage.cs
@@ -17,10 +17,7 @@
 #region ================== Namespaces
 
 using System;
-using System.Collections;
 using System.Collections.Generic;
-using System.Globalization;
-using System.Text;
 using System.Drawing;
 using System.Drawing.Imaging;
 using CodeImp.DoomBuilder.Rendering;
diff --git a/Source/Core/Data/ImageData.cs b/Source/Core/Data/ImageData.cs
index 4bffb09cd156b115eacaa0bde7984f78d5241b65..56f5693facaa065de4c2ad5a9bc6c9c68ec0598a 100644
--- a/Source/Core/Data/ImageData.cs
+++ b/Source/Core/Data/ImageData.cs
@@ -17,11 +17,7 @@
 #region ================== Namespaces
 
 using System;
-using System.Collections;
-using System.Collections.Generic;
 using System.Drawing.Drawing2D;
-using System.Globalization;
-using System.Text;
 using System.Drawing;
 using CodeImp.DoomBuilder.Geometry;
 using SlimDX;
@@ -30,7 +26,6 @@ using System.Drawing.Imaging;
 using CodeImp.DoomBuilder.Rendering;
 using CodeImp.DoomBuilder.IO;
 using System.IO;
-using System.Windows.Forms;
 using System.Runtime.InteropServices;
 using CodeImp.DoomBuilder.Windows;
 
diff --git a/Source/Core/Data/ImageDataFormat.cs b/Source/Core/Data/ImageDataFormat.cs
index d27675b5611996b482b6526b047e7b9a8fde4dcb..40adbf175eadba92e91c8afe9d159dd3f42ecde4 100644
--- a/Source/Core/Data/ImageDataFormat.cs
+++ b/Source/Core/Data/ImageDataFormat.cs
@@ -16,13 +16,7 @@
 
 #region ================== Namespaces
 
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Text;
 using System.IO;
-using System.Drawing.Imaging;
 using CodeImp.DoomBuilder.IO;
 
 #endregion
diff --git a/Source/Core/Data/ImageLoadState.cs b/Source/Core/Data/ImageLoadState.cs
index 7c4a1653e1f28bcca5cfbd62c8f64216c55df72a..b2a04a2656a5bfca0f99f196ffb7cc0262f06db1 100644
--- a/Source/Core/Data/ImageLoadState.cs
+++ b/Source/Core/Data/ImageLoadState.cs
@@ -16,19 +16,6 @@
 
 #region ================== Namespaces
 
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Text;
-using System.Drawing;
-using SlimDX.Direct3D9;
-using System.Drawing.Imaging;
-using CodeImp.DoomBuilder.Rendering;
-using CodeImp.DoomBuilder.IO;
-using System.IO;
-using System.Windows.Forms;
-
 #endregion
 
 namespace CodeImp.DoomBuilder.Data
diff --git a/Source/Core/Data/PK3FileImage.cs b/Source/Core/Data/PK3FileImage.cs
index a597945f79095d73502724c1402ebfb2ef1a3487..a4d75248a6deb3b8897cb26694db5ee64c856b58 100644
--- a/Source/Core/Data/PK3FileImage.cs
+++ b/Source/Core/Data/PK3FileImage.cs
@@ -17,12 +17,6 @@
 #region ================== Namespaces
 
 using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Text;
-using System.Drawing;
-using System.Drawing.Imaging;
 using System.IO;
 using CodeImp.DoomBuilder.IO;
 
diff --git a/Source/Core/Data/PK3Reader.cs b/Source/Core/Data/PK3Reader.cs
index e8b11c2c6562daa44285e14ba4432e3ab70e7fe8..b71339b3bab0cc5a6b4468f72255749834052d62 100644
--- a/Source/Core/Data/PK3Reader.cs
+++ b/Source/Core/Data/PK3Reader.cs
@@ -17,19 +17,12 @@
 #region ================== Namespaces
 
 using System;
-using System.Collections;
 using System.Collections.Generic;
-using System.Globalization;
-using System.Text;
-using System.Drawing;
-using System.Drawing.Imaging;
 using System.IO;
 using CodeImp.DoomBuilder.IO;
-//using ICSharpCode.SharpZipLib.Zip;
-//mxd
-using SharpCompress.Archive;
-using SharpCompress.Common;
-using SharpCompress.Reader;
+using SharpCompress.Archive; //mxd
+using SharpCompress.Common; //mxd
+using SharpCompress.Reader; //mxd
 
 #endregion
 
diff --git a/Source/Core/Data/PK3StructuredReader.cs b/Source/Core/Data/PK3StructuredReader.cs
index 4ddfadf69a4124da697c34f6dfd319b079c375f6..a7451c1a930de9ed793f4fcd98f6c057e0df4dfc 100644
--- a/Source/Core/Data/PK3StructuredReader.cs
+++ b/Source/Core/Data/PK3StructuredReader.cs
@@ -19,12 +19,7 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
-using System.Globalization;
-using System.Text;
-using System.Drawing;
-using System.Drawing.Imaging;
 using System.IO;
-using CodeImp.DoomBuilder.IO;
 using CodeImp.DoomBuilder.GZBuilder.Data;
 
 #endregion
diff --git a/Source/Core/Data/PatchNames.cs b/Source/Core/Data/PatchNames.cs
index a90b3cffaccbe65023aa0d33f197f8d2a065955d..a763995781ccfdd6c1681ee0b4b825f1e3e39bb6 100644
--- a/Source/Core/Data/PatchNames.cs
+++ b/Source/Core/Data/PatchNames.cs
@@ -16,11 +16,6 @@
 
 #region ================== Namespaces
 
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Text;
 using System.IO;
 using CodeImp.DoomBuilder.IO;
 
diff --git a/Source/Core/Data/Playpal.cs b/Source/Core/Data/Playpal.cs
index 6c2ead47ae1da93a61f5bb4e41c345f751f75511..d90cc0fbe3ac70b94dbd51a7311bac9b1cb15c91 100644
--- a/Source/Core/Data/Playpal.cs
+++ b/Source/Core/Data/Playpal.cs
@@ -16,11 +16,6 @@
 
 #region ================== Namespaces
 
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Text;
 using System.IO;
 using CodeImp.DoomBuilder.Rendering;
 
diff --git a/Source/Core/Data/PreviewManager.cs b/Source/Core/Data/PreviewManager.cs
index 49f3b9b2a76ecc5e91c1cae2f21864ffe0e92642..143ccd4876221c7823cef30cf99605cba276e9f2 100644
--- a/Source/Core/Data/PreviewManager.cs
+++ b/Source/Core/Data/PreviewManager.cs
@@ -17,14 +17,9 @@
 #region ================== Namespaces
 
 using System;
-using System.Collections;
 using System.Collections.Generic;
-using System.Globalization;
-using System.Text;
 using System.Drawing;
 using System.Drawing.Imaging;
-using CodeImp.DoomBuilder.Rendering;
-using CodeImp.DoomBuilder.IO;
 using System.IO;
 using System.Drawing.Drawing2D;
 
diff --git a/Source/Core/Data/ResourceImage.cs b/Source/Core/Data/ResourceImage.cs
index 47d36d60b00ef7c0b55b49466b68682c4bb01f85..b70917e2862bf403def2072575891f0fb9feaf36 100644
--- a/Source/Core/Data/ResourceImage.cs
+++ b/Source/Core/Data/ResourceImage.cs
@@ -17,15 +17,8 @@
 #region ================== Namespaces
 
 using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Globalization;
 using System.Reflection;
-using System.Text;
 using System.Drawing;
-using System.Drawing.Imaging;
-using CodeImp.DoomBuilder.Rendering;
-using CodeImp.DoomBuilder.IO;
 using System.IO;
 
 #endregion
diff --git a/Source/Core/Data/SimpleTextureImage.cs b/Source/Core/Data/SimpleTextureImage.cs
index 8555e1dcaece54451c53fd789e9b5c13b11ca786..e5e3e04f1e796be1f7ec451ce788c7aea3625704 100644
--- a/Source/Core/Data/SimpleTextureImage.cs
+++ b/Source/Core/Data/SimpleTextureImage.cs
@@ -17,13 +17,6 @@
 #region ================== Namespaces
 
 using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Text;
-using System.Drawing;
-using System.Drawing.Imaging;
-using CodeImp.DoomBuilder.Rendering;
 using CodeImp.DoomBuilder.IO;
 using System.IO;
 
diff --git a/Source/Core/Data/SpriteImage.cs b/Source/Core/Data/SpriteImage.cs
index 099b04a36d69e957b09806dcdaf69566b2d46821..d7db629ee0398edeb0871368ab06ab30a2373d08 100644
--- a/Source/Core/Data/SpriteImage.cs
+++ b/Source/Core/Data/SpriteImage.cs
@@ -17,13 +17,6 @@
 #region ================== Namespaces
 
 using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Text;
-using System.Drawing;
-using System.Drawing.Imaging;
-using CodeImp.DoomBuilder.Rendering;
 using CodeImp.DoomBuilder.IO;
 using System.IO;
 
diff --git a/Source/Core/Data/TextureImage.cs b/Source/Core/Data/TextureImage.cs
index fbf741942eebbddc023e3f5c07971dbb0f6caede..7d3a4d317357bc8beeda89c7f9736fd6528ad76a 100644
--- a/Source/Core/Data/TextureImage.cs
+++ b/Source/Core/Data/TextureImage.cs
@@ -17,10 +17,7 @@
 #region ================== Namespaces
 
 using System;
-using System.Collections;
 using System.Collections.Generic;
-using System.Globalization;
-using System.Text;
 using System.Drawing;
 using System.Drawing.Imaging;
 using CodeImp.DoomBuilder.Rendering;
diff --git a/Source/Core/Data/TexturePatch.cs b/Source/Core/Data/TexturePatch.cs
index 4f3ddcc42a6f29286bea39fbe3ceeefac3520638..79229b99556bf592f21a8da93811f4de97a62421 100644
--- a/Source/Core/Data/TexturePatch.cs
+++ b/Source/Core/Data/TexturePatch.cs
@@ -16,15 +16,6 @@
 
 #region ================== Namespaces
 
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Text;
-using System.Drawing;
-using System.Drawing.Imaging;
-using System.IO;
-using CodeImp.DoomBuilder.IO;
 using CodeImp.DoomBuilder.Rendering;
 using CodeImp.DoomBuilder.ZDoom;
 
diff --git a/Source/Core/Data/UnknownImage.cs b/Source/Core/Data/UnknownImage.cs
index e73c1177fb222a7cf8b7f047420cd01d2e1ccfa0..bfefbd8162bd3a1ba6b5f292777a66cf32fd971d 100644
--- a/Source/Core/Data/UnknownImage.cs
+++ b/Source/Core/Data/UnknownImage.cs
@@ -17,15 +17,7 @@
 #region ================== Namespaces
 
 using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Text;
 using System.Drawing;
-using System.Drawing.Imaging;
-using CodeImp.DoomBuilder.Rendering;
-using CodeImp.DoomBuilder.IO;
-using System.IO;
 
 #endregion
 
diff --git a/Source/Core/Data/WADReader.cs b/Source/Core/Data/WADReader.cs
index ad0cc1a41585076a6e99e5cd25572e2d585c83bc..e817c0213ca26756746f72c2f0c8964bccfd058c 100644
--- a/Source/Core/Data/WADReader.cs
+++ b/Source/Core/Data/WADReader.cs
@@ -19,14 +19,9 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
-using System.Globalization;
-using System.Text;
-using System.Drawing;
-using System.Drawing.Imaging;
 using System.IO;
 using CodeImp.DoomBuilder.IO;
 using CodeImp.DoomBuilder.ZDoom;
-using CodeImp.DoomBuilder.Rendering;
 using CodeImp.DoomBuilder.GZBuilder.Data;
 
 #endregion
diff --git a/Source/Core/Editing/ClassicMode.cs b/Source/Core/Editing/ClassicMode.cs
index 955a110a9a3f5c32269a46037bfeb678a96d41b2..d532ac29d6e54608102688bae3dad0a6a24bf3e7 100644
--- a/Source/Core/Editing/ClassicMode.cs
+++ b/Source/Core/Editing/ClassicMode.cs
@@ -17,15 +17,8 @@
 #region ================== Namespaces
 
 using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Text;
 using System.Windows.Forms;
-using System.IO;
-using System.Reflection;
 using CodeImp.DoomBuilder.Windows;
-using CodeImp.DoomBuilder.IO;
 using CodeImp.DoomBuilder.Map;
 using CodeImp.DoomBuilder.Rendering;
 using CodeImp.DoomBuilder.Actions;
diff --git a/Source/Core/Editing/CopyPasteManager.cs b/Source/Core/Editing/CopyPasteManager.cs
index 64913c7fa6aaf6fe94741580df5975dc47963164..b4750169e860fed08a829a5539b5e8058a2dcbe6 100644
--- a/Source/Core/Editing/CopyPasteManager.cs
+++ b/Source/Core/Editing/CopyPasteManager.cs
@@ -17,24 +17,15 @@
 #region ================== Namespaces
 
 using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Text;
 using System.Windows.Forms;
 using System.IO;
-using System.Reflection;
 using CodeImp.DoomBuilder.Windows;
 using CodeImp.DoomBuilder.IO;
 using CodeImp.DoomBuilder.Map;
-using CodeImp.DoomBuilder.Rendering;
-using System.Diagnostics;
 using CodeImp.DoomBuilder.Actions;
-//using ICSharpCode.SharpZipLib.BZip2;
 using CodeImp.DoomBuilder.Config;
 using CodeImp.DoomBuilder.Geometry;
-//mxd
-using CodeImp.DoomBuilder.GZBuilder.Data;
+using CodeImp.DoomBuilder.GZBuilder.Data; //mxd
 
 #endregion
 
diff --git a/Source/Core/Editing/CustomThingsFilter.cs b/Source/Core/Editing/CustomThingsFilter.cs
index f584825613fdd763e8d5e645a51ae65c3211438c..c3eb273ec6db730019790480528251cbc8001d1d 100644
--- a/Source/Core/Editing/CustomThingsFilter.cs
+++ b/Source/Core/Editing/CustomThingsFilter.cs
@@ -17,16 +17,7 @@
 #region ================== Namespaces
 
 using System;
-using System.Collections;
 using System.Collections.Generic;
-using System.Globalization;
-using System.Text;
-using System.Windows.Forms;
-using System.IO;
-using System.Reflection;
-using CodeImp.DoomBuilder.Map;
-using CodeImp.DoomBuilder.IO;
-using CodeImp.DoomBuilder.Config;
 
 #endregion
 
diff --git a/Source/Core/Editing/EditMode.cs b/Source/Core/Editing/EditMode.cs
index 9d39bae10177c9f8a5d6b5b97d0c514d36e49ee1..431649a3c78d617524550f83b749f7aa464648a3 100644
--- a/Source/Core/Editing/EditMode.cs
+++ b/Source/Core/Editing/EditMode.cs
@@ -17,19 +17,10 @@
 #region ================== Namespaces
 
 using System;
-using System.Collections;
-using System.Collections.Generic;
 using System.Globalization;
-using System.Text;
 using System.Windows.Forms;
-using System.IO;
 using System.Reflection;
-using CodeImp.DoomBuilder.Windows;
-using CodeImp.DoomBuilder.IO;
-using CodeImp.DoomBuilder.Map;
-using CodeImp.DoomBuilder.Rendering;
 using System.Diagnostics;
-using CodeImp.DoomBuilder.Actions;
 using CodeImp.DoomBuilder.Geometry;
 using CodeImp.DoomBuilder.Config;
 
diff --git a/Source/Core/Editing/EditModeAttribute.cs b/Source/Core/Editing/EditModeAttribute.cs
index 551af29e4b86c1a3ee97a99d76f15dc796ff8ea9..fc4f8c500d1b6cd36745a8715eac565a68e51a33 100644
--- a/Source/Core/Editing/EditModeAttribute.cs
+++ b/Source/Core/Editing/EditModeAttribute.cs
@@ -17,11 +17,6 @@
 #region ================== Namespaces
 
 using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Drawing;
-using System.Text;
-using System.Windows.Forms;
 
 #endregion
 
diff --git a/Source/Core/Editing/EditModeInfo.cs b/Source/Core/Editing/EditModeInfo.cs
index 8681283a5d9bf267593b60f69c6a8c65d88141d7..ab66e3baa43befe83081efd6f11cba9e8d12bb69 100644
--- a/Source/Core/Editing/EditModeInfo.cs
+++ b/Source/Core/Editing/EditModeInfo.cs
@@ -17,13 +17,7 @@
 #region ================== Namespaces
 
 using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Text;
-using System.Windows.Forms;
 using System.IO;
-using System.Reflection;
 using CodeImp.DoomBuilder.Actions;
 using CodeImp.DoomBuilder.Plugins;
 using System.Drawing;
diff --git a/Source/Core/Editing/EditingManager.cs b/Source/Core/Editing/EditingManager.cs
index d980ad9e16568883316331a9831b0b654c64dba4..2c924f3605b47d8a16bae6f1a87db950151c7792 100644
--- a/Source/Core/Editing/EditingManager.cs
+++ b/Source/Core/Editing/EditingManager.cs
@@ -17,20 +17,10 @@
 #region ================== Namespaces
 
 using System;
-using System.Collections;
 using System.Collections.Generic;
-using System.Globalization;
-using System.Text;
 using System.Windows.Forms;
-using System.IO;
-using System.Reflection;
 using CodeImp.DoomBuilder.Windows;
-using CodeImp.DoomBuilder.IO;
-using CodeImp.DoomBuilder.Map;
-using CodeImp.DoomBuilder.Rendering;
-using System.Diagnostics;
 using CodeImp.DoomBuilder.Actions;
-using CodeImp.DoomBuilder.Geometry;
 using CodeImp.DoomBuilder.Plugins;
 using CodeImp.DoomBuilder.VisualModes;
 
diff --git a/Source/Core/Editing/GridSetup.cs b/Source/Core/Editing/GridSetup.cs
index ce6af3113398458e73149fd19be589120043cbb4..f35d0170e686ecfeedee286fa10391a04febd8a1 100644
--- a/Source/Core/Editing/GridSetup.cs
+++ b/Source/Core/Editing/GridSetup.cs
@@ -17,19 +17,9 @@
 #region ================== Namespaces
 
 using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Text;
 using System.Windows.Forms;
-using System.IO;
-using System.Reflection;
-using CodeImp.DoomBuilder.VisualModes;
 using CodeImp.DoomBuilder.Windows;
 using CodeImp.DoomBuilder.IO;
-using CodeImp.DoomBuilder.Map;
-using CodeImp.DoomBuilder.Rendering;
-using System.Diagnostics;
 using CodeImp.DoomBuilder.Actions;
 using CodeImp.DoomBuilder.Data;
 using CodeImp.DoomBuilder.Geometry;
diff --git a/Source/Core/Editing/NullThingsFilter.cs b/Source/Core/Editing/NullThingsFilter.cs
index 3a9f7972a35f54b5f93b3fcfec3fd5314e0ec129..5b93e151ed5c8424114c0c24ffecd728b2834db4 100644
--- a/Source/Core/Editing/NullThingsFilter.cs
+++ b/Source/Core/Editing/NullThingsFilter.cs
@@ -16,14 +16,7 @@
 
 #region ================== Namespaces
 
-using System;
-using System.Collections;
 using System.Collections.Generic;
-using System.Globalization;
-using System.Text;
-using System.Windows.Forms;
-using System.IO;
-using System.Reflection;
 using CodeImp.DoomBuilder.Map;
 
 #endregion
diff --git a/Source/Core/Editing/ThingsFilter.cs b/Source/Core/Editing/ThingsFilter.cs
index 5f5873eb01b3e4318ea4ac06eaf621fe7925483b..6c90f76ba19b297ebe268407f31271c1998b20a8 100644
--- a/Source/Core/Editing/ThingsFilter.cs
+++ b/Source/Core/Editing/ThingsFilter.cs
@@ -20,10 +20,6 @@ using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Globalization;
-using System.Text;
-using System.Windows.Forms;
-using System.IO;
-using System.Reflection;
 using CodeImp.DoomBuilder.Map;
 using CodeImp.DoomBuilder.IO;
 using CodeImp.DoomBuilder.Config;
diff --git a/Source/Core/Editing/UndoManager.cs b/Source/Core/Editing/UndoManager.cs
index 56475e75ce0d43208b4f53d057d19c616aeb7dfc..e018557e4b0ebe67bf2a2b62793502f918b8d306 100644
--- a/Source/Core/Editing/UndoManager.cs
+++ b/Source/Core/Editing/UndoManager.cs
@@ -17,21 +17,15 @@
 #region ================== Namespaces
 
 using System;
-using System.Collections;
 using System.Collections.Generic;
-using System.Globalization;
-using System.Text;
 using System.Threading;
 using System.Windows.Forms;
 using System.IO;
-using System.Reflection;
 using CodeImp.DoomBuilder.Geometry;
 using CodeImp.DoomBuilder.Plugins;
 using CodeImp.DoomBuilder.Windows;
 using CodeImp.DoomBuilder.IO;
 using CodeImp.DoomBuilder.Map;
-using CodeImp.DoomBuilder.Rendering;
-using System.Diagnostics;
 using CodeImp.DoomBuilder.Actions;
 
 #endregion
diff --git a/Source/Core/Editing/UndoSnapshot.cs b/Source/Core/Editing/UndoSnapshot.cs
index 7b2f40df1ff6c28ef6443bf8198f57c405b50ade..a32707583afd267979b619ca7dd167e882c7f7a4 100644
--- a/Source/Core/Editing/UndoSnapshot.cs
+++ b/Source/Core/Editing/UndoSnapshot.cs
@@ -16,20 +16,7 @@
 
 #region ================== Namespaces
 
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Text;
-using System.Windows.Forms;
 using System.IO;
-using System.Reflection;
-using CodeImp.DoomBuilder.Windows;
-using CodeImp.DoomBuilder.IO;
-using CodeImp.DoomBuilder.Map;
-using CodeImp.DoomBuilder.Rendering;
-using System.Diagnostics;
-using CodeImp.DoomBuilder.Actions;
 using CodeImp.DoomBuilder.GZBuilder.Data; //mxd
 
 #endregion
diff --git a/Source/Core/GZBuilder/Controls/CustomLinedefColorProperties.cs b/Source/Core/GZBuilder/Controls/CustomLinedefColorProperties.cs
index 8e27c9b74ae61b8011012815adb68bc26f9e302e..120b7d189e3ecf1433aa5c570d67b0e572e733b7 100644
--- a/Source/Core/GZBuilder/Controls/CustomLinedefColorProperties.cs
+++ b/Source/Core/GZBuilder/Controls/CustomLinedefColorProperties.cs
@@ -1,9 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.ComponentModel;
-using System.Drawing;
-using System.Data;
-using System.Text;
 using System.Windows.Forms;
 using CodeImp.DoomBuilder.Rendering;
 using CodeImp.DoomBuilder.GZBuilder.Data;
diff --git a/Source/Core/GZBuilder/Controls/CustomLinedefColorsControl.cs b/Source/Core/GZBuilder/Controls/CustomLinedefColorsControl.cs
index 7c1dafdddb6d98194fa5bf24a3a75051e88744e7..90bcc5fdb6a02795291b94b74e14ccdd8de4cd04 100644
--- a/Source/Core/GZBuilder/Controls/CustomLinedefColorsControl.cs
+++ b/Source/Core/GZBuilder/Controls/CustomLinedefColorsControl.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.ComponentModel;
 using System.Drawing;
-using System.Data;
-using System.Text;
 using System.Windows.Forms;
 using CodeImp.DoomBuilder.GZBuilder.Data;
 using CodeImp.DoomBuilder.Config;
diff --git a/Source/Core/GZBuilder/Controls/IconListBox.cs b/Source/Core/GZBuilder/Controls/IconListBox.cs
index d3020982cd7e7a02e401410d89531f75a09b3cd7..7252c9fc1461b5439e746c6749503205725013ed 100644
--- a/Source/Core/GZBuilder/Controls/IconListBox.cs
+++ b/Source/Core/GZBuilder/Controls/IconListBox.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Windows.Forms;
+using System.Windows.Forms;
 using System.Drawing;
 using CodeImp.DoomBuilder.GZBuilder.Data;
 
diff --git a/Source/Core/GZBuilder/Controls/TagSelector.cs b/Source/Core/GZBuilder/Controls/TagSelector.cs
index 0216814bec4049d99dfee8d4335ab9248570fea6..5a3bae0babec9d1446c8fe00781cc58f355527c8 100644
--- a/Source/Core/GZBuilder/Controls/TagSelector.cs
+++ b/Source/Core/GZBuilder/Controls/TagSelector.cs
@@ -1,9 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.ComponentModel;
-using System.Drawing;
-using System.Data;
-using System.Text;
 using System.Windows.Forms;
 using CodeImp.DoomBuilder.Map;
 using System.Globalization;
diff --git a/Source/Core/GZBuilder/Data/EngineInfo.cs b/Source/Core/GZBuilder/Data/EngineInfo.cs
index 868ab8dd25ae4680572194646c2de89546d9f03b..84b6d904f975f375395cba7e10b56002926678a6 100644
--- a/Source/Core/GZBuilder/Data/EngineInfo.cs
+++ b/Source/Core/GZBuilder/Data/EngineInfo.cs
@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 using System.IO;
 
 namespace CodeImp.DoomBuilder.GZBuilder.Data {
diff --git a/Source/Core/GZBuilder/Data/GZDoomLight.cs b/Source/Core/GZBuilder/Data/GZDoomLight.cs
index 2310905ddbe7cbe7dae2eea43c3bfea13098b12d..ccdf7962714180529e446653878a934c5d6171cc 100644
--- a/Source/Core/GZBuilder/Data/GZDoomLight.cs
+++ b/Source/Core/GZBuilder/Data/GZDoomLight.cs
@@ -1,5 +1,4 @@
-using System;
-using SlimDX;
+using SlimDX;
 
 namespace CodeImp.DoomBuilder.GZBuilder.Data
 {
diff --git a/Source/Core/GZBuilder/Data/GameType.cs b/Source/Core/GZBuilder/Data/GameType.cs
index ed5e4e37151f7e819fbe4e8ea1eb4f83c087bdd7..c0572f68af846f4cc8d76ef2640cf1a4d533b1e0 100644
--- a/Source/Core/GZBuilder/Data/GameType.cs
+++ b/Source/Core/GZBuilder/Data/GameType.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
+
 namespace CodeImp.DoomBuilder.GZBuilder.Data {
     public enum GameType : int {
         UNKNOWN = 0,
diff --git a/Source/Core/GZBuilder/Data/LinedefColorPreset.cs b/Source/Core/GZBuilder/Data/LinedefColorPreset.cs
index b973ed1b1b119c05e38e8d76a942c9763d2b0972..1e2a32e0c3e21c0ef2d1944be6f98b14735658f1 100644
--- a/Source/Core/GZBuilder/Data/LinedefColorPreset.cs
+++ b/Source/Core/GZBuilder/Data/LinedefColorPreset.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
+using System.Collections.Generic;
 using CodeImp.DoomBuilder.Rendering;
 using CodeImp.DoomBuilder.Map;
 
diff --git a/Source/Core/GZBuilder/Data/LinksCollector.cs b/Source/Core/GZBuilder/Data/LinksCollector.cs
index 9351c2ed86f650878aa809ffa3eb47b78b8221c2..0c68c8308bcbb8c845a6fcadef899d46832899ac 100644
--- a/Source/Core/GZBuilder/Data/LinksCollector.cs
+++ b/Source/Core/GZBuilder/Data/LinksCollector.cs
@@ -1,12 +1,8 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-//using CodeImp.DoomBuilder.Geometry;
+using System.Collections.Generic;
 using CodeImp.DoomBuilder.Map;
 using CodeImp.DoomBuilder.VisualModes;
 using CodeImp.DoomBuilder.GZBuilder.Geometry;
 using CodeImp.DoomBuilder.Geometry;
-using CodeImp.DoomBuilder.Rendering;
 using CodeImp.DoomBuilder.Config;
 
 namespace CodeImp.DoomBuilder.GZBuilder.Data {
diff --git a/Source/Core/GZBuilder/Data/MapInfo.cs b/Source/Core/GZBuilder/Data/MapInfo.cs
index 2109fe4619ae11cf201f1d6107f3d94a62b278e7..6092807201e962df5c82ba158b97fd2b8232c747 100644
--- a/Source/Core/GZBuilder/Data/MapInfo.cs
+++ b/Source/Core/GZBuilder/Data/MapInfo.cs
@@ -1,6 +1,4 @@
-using System;
-using SlimDX;
-using SlimDX.Direct3D9;
+using SlimDX;
 
 namespace CodeImp.DoomBuilder.GZBuilder.Data {
     public sealed class MapInfo {
diff --git a/Source/Core/GZBuilder/Data/ModelDefEntry.cs b/Source/Core/GZBuilder/Data/ModelDefEntry.cs
index 147a73d5afe545113460233e95697f50ae309394..8fdd814481b11bf0642146ed9a9a7f6da068a854 100644
--- a/Source/Core/GZBuilder/Data/ModelDefEntry.cs
+++ b/Source/Core/GZBuilder/Data/ModelDefEntry.cs
@@ -1,10 +1,6 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
+using System.Collections.Generic;
 using SlimDX;
 using SlimDX.Direct3D9;
-
 using CodeImp.DoomBuilder.GZBuilder.MD3;
 
 namespace CodeImp.DoomBuilder.GZBuilder.Data
diff --git a/Source/Core/GZBuilder/Data/ScriptItem.cs b/Source/Core/GZBuilder/Data/ScriptItem.cs
index 84596bc2b27d20d3e5eb78575c268e65c1092484..9960bc2c31c118dcc209ce4a97aad8d94e7a2d96 100644
--- a/Source/Core/GZBuilder/Data/ScriptItem.cs
+++ b/Source/Core/GZBuilder/Data/ScriptItem.cs
@@ -1,7 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 
 namespace CodeImp.DoomBuilder.GZBuilder.Data {
     internal sealed class ScriptItem : Object {
diff --git a/Source/Core/GZBuilder/Data/ScriptType.cs b/Source/Core/GZBuilder/Data/ScriptType.cs
index 2a6b6b2d428ed54e4ed21884dca44bcbd8c3eda1..067ee0b00feec57a2b85f96a166841592f3a0ba6 100644
--- a/Source/Core/GZBuilder/Data/ScriptType.cs
+++ b/Source/Core/GZBuilder/Data/ScriptType.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
+
 namespace CodeImp.DoomBuilder.GZBuilder.Data {
     internal enum ScriptType : int {
         UNKNOWN = 0,
diff --git a/Source/Core/GZBuilder/Data/SharpCompressHelper.cs b/Source/Core/GZBuilder/Data/SharpCompressHelper.cs
index 809bef8f578711cbc5226088d7cf2c0f7ac606f5..66fa93706c2b9028234aad252e69067310915e72 100644
--- a/Source/Core/GZBuilder/Data/SharpCompressHelper.cs
+++ b/Source/Core/GZBuilder/Data/SharpCompressHelper.cs
@@ -1,5 +1,4 @@
-using System;
-using System.IO;
+using System.IO;
 using SharpCompress.Compressor;
 using SharpCompress.Compressor.BZip2;
 
diff --git a/Source/Core/GZBuilder/Data/TextureData.cs b/Source/Core/GZBuilder/Data/TextureData.cs
index 209b0f5ec31c8b3859fd12a8c5d26dd501901b0b..ed14da5363e0baa58b6d754b2e68ad81b0440ec5 100644
--- a/Source/Core/GZBuilder/Data/TextureData.cs
+++ b/Source/Core/GZBuilder/Data/TextureData.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace CodeImp.DoomBuilder.GZBuilder.Data {
+namespace CodeImp.DoomBuilder.GZBuilder.Data {
     public struct TextureData {
         public const string INVALID_TEXTURE = "**INVALID_TEXTURE**";
         public static string[] SUPPORTED_TEXTURE_EXTENSIONS = { ".jpg", ".tga", ".png", ".dds", ".pcx" };
diff --git a/Source/Core/GZBuilder/Data/ThingCopyData.cs b/Source/Core/GZBuilder/Data/ThingCopyData.cs
index f84b7d2237af8f8761b10406afd77847f822ac85..a6af058aeeca091a85c4474b6930973ab508ab03 100644
--- a/Source/Core/GZBuilder/Data/ThingCopyData.cs
+++ b/Source/Core/GZBuilder/Data/ThingCopyData.cs
@@ -1,9 +1,6 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
+using System.Collections.Generic;
 using CodeImp.DoomBuilder.Map;
 using CodeImp.DoomBuilder.Geometry;
-using CodeImp.DoomBuilder.Rendering;
 
 namespace CodeImp.DoomBuilder.GZBuilder.Data {
     public sealed class ThingCopyData {
diff --git a/Source/Core/GZBuilder/GZDoom/AcsParserSE.cs b/Source/Core/GZBuilder/GZDoom/AcsParserSE.cs
index d16fc8b4402c688476eb8a09185405a099ddd027..c80ae155f5a35dc486c45ed45b7debe0c02286f5 100644
--- a/Source/Core/GZBuilder/GZDoom/AcsParserSE.cs
+++ b/Source/Core/GZBuilder/GZDoom/AcsParserSE.cs
@@ -1,9 +1,6 @@
-using System;
-using System.IO;
+using System.IO;
 using System.Collections.Generic;
 using System.Globalization;
-using System.Text;
-
 using CodeImp.DoomBuilder.ZDoom;
 using CodeImp.DoomBuilder.GZBuilder.Data;
 
diff --git a/Source/Core/GZBuilder/GZDoom/DecorateParserSE.cs b/Source/Core/GZBuilder/GZDoom/DecorateParserSE.cs
index d1dcc2064980a4e98fb6d027c0f783dba5d8abdb..c52ff2ca273a58d9372d57226a611d34bc2b8b7b 100644
--- a/Source/Core/GZBuilder/GZDoom/DecorateParserSE.cs
+++ b/Source/Core/GZBuilder/GZDoom/DecorateParserSE.cs
@@ -1,8 +1,5 @@
-using System;
-using System.IO;
+using System.IO;
 using System.Collections.Generic;
-using System.Text;
-
 using CodeImp.DoomBuilder.ZDoom;
 using CodeImp.DoomBuilder.GZBuilder.Data;
 
diff --git a/Source/Core/GZBuilder/GZDoom/GldefsParser.cs b/Source/Core/GZBuilder/GZDoom/GldefsParser.cs
index a16656a7029a6676c55b8c5456c1e08a995e36f9..8d42a40628b2b4a8d96ad539343cc3bdc1ee3d61 100644
--- a/Source/Core/GZBuilder/GZDoom/GldefsParser.cs
+++ b/Source/Core/GZBuilder/GZDoom/GldefsParser.cs
@@ -1,14 +1,9 @@
-using System;
-using System.IO;
+using System.IO;
 using System.Collections.Generic;
 using System.Globalization;
-using System.Text;
-
 using CodeImp.DoomBuilder.ZDoom;
 using CodeImp.DoomBuilder.GZBuilder.Data;
 
-using SlimDX;
-using SlimDX.Direct3D9;
 
 namespace CodeImp.DoomBuilder.GZBuilder.GZDoom {
     public sealed class GldefsParser : ZDTextParser {
diff --git a/Source/Core/GZBuilder/GZDoom/MapinfoParser.cs b/Source/Core/GZBuilder/GZDoom/MapinfoParser.cs
index 4dcd64652555722a267c5c463f0c387eddf177f1..b539473d1cf9d5c842efe88852dadac0acb69a84 100644
--- a/Source/Core/GZBuilder/GZDoom/MapinfoParser.cs
+++ b/Source/Core/GZBuilder/GZDoom/MapinfoParser.cs
@@ -2,12 +2,7 @@
 using System.Drawing;
 using System.Globalization;
 using System.IO;
-using System.Collections.Generic;
-using System.Text;
-
 using SlimDX;
-using SlimDX.Direct3D9;
-
 using CodeImp.DoomBuilder.ZDoom;
 using CodeImp.DoomBuilder.GZBuilder.Data;
 
diff --git a/Source/Core/GZBuilder/GZDoom/ModeldefParser.cs b/Source/Core/GZBuilder/GZDoom/ModeldefParser.cs
index 6392ae9a8866bb7f963b563913b9646d786e4695..abd8a42ab67dfad28ea343663b014691a3aa3ada 100644
--- a/Source/Core/GZBuilder/GZDoom/ModeldefParser.cs
+++ b/Source/Core/GZBuilder/GZDoom/ModeldefParser.cs
@@ -1,11 +1,7 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.IO;
-using System.Text;
-
 using CodeImp.DoomBuilder.ZDoom;
 using CodeImp.DoomBuilder.GZBuilder.Data;
-using CodeImp.DoomBuilder.GZBuilder.GZDoom;
 
 namespace CodeImp.DoomBuilder.GZBuilder.GZDoom {
    
diff --git a/Source/Core/GZBuilder/GZDoom/ModeldefParserSE.cs b/Source/Core/GZBuilder/GZDoom/ModeldefParserSE.cs
index a4caf66f28d55df1d025606b221a2111c2ed6e4b..5030d0653ca1a11261c02daa7ebc1afb96df523d 100644
--- a/Source/Core/GZBuilder/GZDoom/ModeldefParserSE.cs
+++ b/Source/Core/GZBuilder/GZDoom/ModeldefParserSE.cs
@@ -1,8 +1,5 @@
-using System;
-using System.IO;
+using System.IO;
 using System.Collections.Generic;
-using System.Text;
-
 using CodeImp.DoomBuilder.ZDoom;
 using CodeImp.DoomBuilder.GZBuilder.Data;
 
diff --git a/Source/Core/GZBuilder/GZDoom/ModeldefStructure.cs b/Source/Core/GZBuilder/GZDoom/ModeldefStructure.cs
index 445f1619b6a71742e54060f285768b2f6a329d67..e56f2dcb0513ea28c8c7b49cd082b8db3d68fa58 100644
--- a/Source/Core/GZBuilder/GZDoom/ModeldefStructure.cs
+++ b/Source/Core/GZBuilder/GZDoom/ModeldefStructure.cs
@@ -1,12 +1,7 @@
 using System;
 using System.IO;
-using System.Collections.Generic;
 using System.Globalization;
-using System.Text;
-
 using SlimDX;
-using SlimDX.Direct3D9;
-
 using CodeImp.DoomBuilder.GZBuilder.Data;
 using CodeImp.DoomBuilder.Geometry;
 
diff --git a/Source/Core/GZBuilder/GZDoom/ScriptTypeParserSE.cs b/Source/Core/GZBuilder/GZDoom/ScriptTypeParserSE.cs
index fd708b1ece0c8d3cc001f2f88e63500fab1917e4..2ea8ba60173d5e4493b9b798efb2c54a16223ef1 100644
--- a/Source/Core/GZBuilder/GZDoom/ScriptTypeParserSE.cs
+++ b/Source/Core/GZBuilder/GZDoom/ScriptTypeParserSE.cs
@@ -1,8 +1,4 @@
-using System;
-using System.IO;
-using System.Collections.Generic;
-using System.Text;
-
+using System.IO;
 using CodeImp.DoomBuilder.ZDoom;
 using CodeImp.DoomBuilder.GZBuilder.Data;
 
diff --git a/Source/Core/GZBuilder/GZGeneral.cs b/Source/Core/GZBuilder/GZGeneral.cs
index 8b41be3f895652215fc62be76495f36f37bd298f..488cf24adf2ebdbafd4478a42d30e02077ccca8f 100644
--- a/Source/Core/GZBuilder/GZGeneral.cs
+++ b/Source/Core/GZBuilder/GZGeneral.cs
@@ -1,18 +1,8 @@
 using System;
-using System.Collections.Generic;
-using System.Drawing;
 using System.Windows.Forms;
-
-using CodeImp.DoomBuilder.Controls;
-using CodeImp.DoomBuilder.IO;
-using CodeImp.DoomBuilder.Map;
-using CodeImp.DoomBuilder.ZDoom;
 using CodeImp.DoomBuilder.Actions;
 using CodeImp.DoomBuilder.Windows;
-using CodeImp.DoomBuilder.Config;
-
 using CodeImp.DoomBuilder.GZBuilder.Data;
-using CodeImp.DoomBuilder.GZBuilder.Controls;
 
 namespace CodeImp.DoomBuilder.GZBuilder
 {
diff --git a/Source/Core/GZBuilder/Geometry/Line3D.cs b/Source/Core/GZBuilder/Geometry/Line3D.cs
index 3fd6f8576dc7e01ca89812f5ea6c5c189908331e..816a56d7f6ee5d6208ea9ec4d4f65dad9cca38cc 100644
--- a/Source/Core/GZBuilder/Geometry/Line3D.cs
+++ b/Source/Core/GZBuilder/Geometry/Line3D.cs
@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 using CodeImp.DoomBuilder.Geometry;
 
 namespace CodeImp.DoomBuilder.GZBuilder.Geometry {
diff --git a/Source/Core/GZBuilder/Rendering/SizelessVisualThingCage.cs b/Source/Core/GZBuilder/Rendering/SizelessVisualThingCage.cs
index 34ad252450359f830c1b86bce29d10fa31aa4add..3fd6eed7847eb0dee5771c58327aa1216498cc89 100644
--- a/Source/Core/GZBuilder/Rendering/SizelessVisualThingCage.cs
+++ b/Source/Core/GZBuilder/Rendering/SizelessVisualThingCage.cs
@@ -1,6 +1,4 @@
-using System;
-using SlimDX;
-using SlimDX.Direct3D9;
+using SlimDX.Direct3D9;
 using CodeImp.DoomBuilder.Rendering;
 
 namespace CodeImp.DoomBuilder.GZBuilder.Rendering
diff --git a/Source/Core/GZBuilder/Rendering/ThingBoundingBox.cs b/Source/Core/GZBuilder/Rendering/ThingBoundingBox.cs
index 07e0d64993bb9e4fdb19e03e641501f71cb16c23..8259d217b4883ae95ecbb949d90f83e447a79cd8 100644
--- a/Source/Core/GZBuilder/Rendering/ThingBoundingBox.cs
+++ b/Source/Core/GZBuilder/Rendering/ThingBoundingBox.cs
@@ -1,5 +1,4 @@
 using System;
-using SlimDX;
 using SlimDX.Direct3D9;
 using CodeImp.DoomBuilder.Rendering;
 
diff --git a/Source/Core/GZBuilder/Rendering/VisualVertexHandle.cs b/Source/Core/GZBuilder/Rendering/VisualVertexHandle.cs
index 52013f16483e7ffcff4b311bd5366123bbdf57bd..d44855ca412b6d4e4a99af99938b399173933d28 100644
--- a/Source/Core/GZBuilder/Rendering/VisualVertexHandle.cs
+++ b/Source/Core/GZBuilder/Rendering/VisualVertexHandle.cs
@@ -1,6 +1,4 @@
-using System;
-using SlimDX;
-using SlimDX.Direct3D9;
+using SlimDX.Direct3D9;
 using CodeImp.DoomBuilder.Rendering;
 
 namespace CodeImp.DoomBuilder.GZBuilder.Rendering
diff --git a/Source/Core/GZBuilder/Tools/UDMFTools.cs b/Source/Core/GZBuilder/Tools/UDMFTools.cs
index 77fc10c0cd048bb3e2268904c0cecfde2bb08ced..9a3fb72c772f0c69042a5eb542dc0b61e4cbc567 100644
--- a/Source/Core/GZBuilder/Tools/UDMFTools.cs
+++ b/Source/Core/GZBuilder/Tools/UDMFTools.cs
@@ -1,5 +1,4 @@
-using System;
-using CodeImp.DoomBuilder.Map;
+using CodeImp.DoomBuilder.Map;
 using CodeImp.DoomBuilder.Types;
 
 namespace CodeImp.DoomBuilder.GZBuilder.Tools
diff --git a/Source/Core/GZBuilder/Windows/TagStatisticsForm.cs b/Source/Core/GZBuilder/Windows/TagStatisticsForm.cs
index f0ffa432f7a9ef86862869225ce03436ff8dbea0..bfbfa47af9fab02810c6b637ef96bcc44c613d5f 100644
--- a/Source/Core/GZBuilder/Windows/TagStatisticsForm.cs
+++ b/Source/Core/GZBuilder/Windows/TagStatisticsForm.cs
@@ -1,9 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
-using System.Data;
 using System.Drawing;
-using System.Text;
 using System.Windows.Forms;
 using CodeImp.DoomBuilder.Map;
 
diff --git a/Source/Core/GZBuilder/md3/GZModel.cs b/Source/Core/GZBuilder/md3/GZModel.cs
index e1068c20741ee184920850eac7f3ed7f23427e88..66869566095552897d7c566fd2336fa02727a9c8 100644
--- a/Source/Core/GZBuilder/md3/GZModel.cs
+++ b/Source/Core/GZBuilder/md3/GZModel.cs
@@ -1,8 +1,6 @@
 using System.Collections.Generic;
 using SlimDX;
 using SlimDX.Direct3D9;
-using CodeImp.DoomBuilder.Geometry;
-
 
 namespace CodeImp.DoomBuilder.GZBuilder.MD3
 {
diff --git a/Source/Core/GZBuilder/md3/ModelReader.cs b/Source/Core/GZBuilder/md3/ModelReader.cs
index 600090f5a9e74dfffe8b5c40353450e74199c1b1..56d5584f3e579e8f4f0d2bd4b5417843abf4a33b 100644
--- a/Source/Core/GZBuilder/md3/ModelReader.cs
+++ b/Source/Core/GZBuilder/md3/ModelReader.cs
@@ -4,14 +4,10 @@ using System.Drawing;
 using System.Drawing.Imaging;
 using System.Text;
 using System.Collections.Generic;
-
-using CodeImp.DoomBuilder;
 using CodeImp.DoomBuilder.IO;
 using CodeImp.DoomBuilder.Data;
 using CodeImp.DoomBuilder.Rendering;
 using CodeImp.DoomBuilder.GZBuilder.Data;
-using CodeImp.DoomBuilder.GZBuilder.GZDoom;
-
 using SlimDX;
 using SlimDX.Direct3D9;
 using CodeImp.DoomBuilder.Geometry;
diff --git a/Source/Core/General/BinaryHeap.cs b/Source/Core/General/BinaryHeap.cs
index a7a90a9263f4a4195493f8117a642c8003d453b1..5908503c728bf21568b7af35267c5f2ed53e7faf 100644
--- a/Source/Core/General/BinaryHeap.cs
+++ b/Source/Core/General/BinaryHeap.cs
@@ -19,10 +19,7 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
-using System.Globalization;
 using System.Text;
-using System.Runtime.InteropServices;
-using System.Diagnostics;
 
 #endregion
 
diff --git a/Source/Core/General/CRC.cs b/Source/Core/General/CRC.cs
index bdbbc036a089eafbaf6a858bf6ec4f62d1114594..150c5bc740518cf1e7b5f636782b0d8c91ff02ff 100644
--- a/Source/Core/General/CRC.cs
+++ b/Source/Core/General/CRC.cs
@@ -17,12 +17,6 @@
 #region ================== Namespaces
 
 using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Text;
-using System.Runtime.InteropServices;
-using System.Diagnostics;
 
 #endregion
 
diff --git a/Source/Core/General/Clock.cs b/Source/Core/General/Clock.cs
index ff1651f9f4757ba15e59be51f04e853b6bccb92e..8d8785ac2751b7815cd29586a076fec29295207e 100644
--- a/Source/Core/General/Clock.cs
+++ b/Source/Core/General/Clock.cs
@@ -14,7 +14,6 @@
 
 #endregion
 
-using System;
 using SlimDX;
 
 namespace CodeImp.DoomBuilder
diff --git a/Source/Core/General/ErrorItem.cs b/Source/Core/General/ErrorItem.cs
index ac052d14522be4348d6fc39064a7cc2ad0f2dd9a..61d717f2848eefa5f2cabecde715164a6860acc5 100644
--- a/Source/Core/General/ErrorItem.cs
+++ b/Source/Core/General/ErrorItem.cs
@@ -16,14 +16,6 @@
 
 #region ================== Namespaces
 
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Text;
-using System.Runtime.InteropServices;
-using System.Diagnostics;
-
 #endregion
 
 namespace CodeImp.DoomBuilder
diff --git a/Source/Core/General/ErrorLogger.cs b/Source/Core/General/ErrorLogger.cs
index 71826e35d3d64193caa887800897f8f99ccf3d30..8a083a39455c425d4cc7311e74fb275809946661 100644
--- a/Source/Core/General/ErrorLogger.cs
+++ b/Source/Core/General/ErrorLogger.cs
@@ -16,13 +16,7 @@
 
 #region ================== Namespaces
 
-using System;
-using System.Collections;
 using System.Collections.Generic;
-using System.Globalization;
-using System.Text;
-using System.Runtime.InteropServices;
-using System.Diagnostics;
 
 #endregion
 
diff --git a/Source/Core/General/Launcher.cs b/Source/Core/General/Launcher.cs
index 01aee1013eee7301ed05663908e9432af2bb0dbf..3367abafa11a923d6b49e58194de94ea2bb90d58 100644
--- a/Source/Core/General/Launcher.cs
+++ b/Source/Core/General/Launcher.cs
@@ -17,10 +17,6 @@
 #region ================== Namespaces
 
 using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Text;
 using System.IO;
 using CodeImp.DoomBuilder.Data;
 using System.Diagnostics;
diff --git a/Source/Core/General/MapManager.cs b/Source/Core/General/MapManager.cs
index d63c5b40a06820d98b342f08a697eef2a770f7e6..35b79366ed3bd8864cabd8ff15ec1b7e1fee7012 100644
--- a/Source/Core/General/MapManager.cs
+++ b/Source/Core/General/MapManager.cs
@@ -19,12 +19,8 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
-using System.Globalization;
-using System.Text;
 using System.Windows.Forms;
 using System.IO;
-using System.Reflection;
-using System.Diagnostics;
 using CodeImp.DoomBuilder.Windows;
 using CodeImp.DoomBuilder.IO;
 using CodeImp.DoomBuilder.Map;
@@ -33,14 +29,10 @@ using CodeImp.DoomBuilder.Rendering;
 using CodeImp.DoomBuilder.Data;
 using CodeImp.DoomBuilder.Actions;
 using CodeImp.DoomBuilder.Config;
-using CodeImp.DoomBuilder.Plugins;
 using CodeImp.DoomBuilder.Compilers;
 using CodeImp.DoomBuilder.VisualModes;
-
-//mxd
-using CodeImp.DoomBuilder.GZBuilder;
-using CodeImp.DoomBuilder.GZBuilder.Data;
-using CodeImp.DoomBuilder.GZBuilder.GZDoom;
+using CodeImp.DoomBuilder.GZBuilder.Data; //mxd
+using CodeImp.DoomBuilder.GZBuilder.GZDoom; //mxd
 
 #endregion
 
diff --git a/Source/Core/General/SavePurpose.cs b/Source/Core/General/SavePurpose.cs
index e9c81f049be5ed9f2196710796d4115608b30938..b82fdee9f396cc4738f6d2811605cc55a00b6045 100644
--- a/Source/Core/General/SavePurpose.cs
+++ b/Source/Core/General/SavePurpose.cs
@@ -16,27 +16,6 @@
 
 #region ================== Namespaces
 
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Text;
-using System.Windows.Forms;
-using System.IO;
-using System.Reflection;
-using System.Diagnostics;
-using CodeImp.DoomBuilder.Windows;
-using CodeImp.DoomBuilder.IO;
-using CodeImp.DoomBuilder.Map;
-using CodeImp.DoomBuilder.Editing;
-using CodeImp.DoomBuilder.Rendering;
-using CodeImp.DoomBuilder.Data;
-using CodeImp.DoomBuilder.Actions;
-using CodeImp.DoomBuilder.Config;
-using CodeImp.DoomBuilder.Plugins;
-using CodeImp.DoomBuilder.Compilers;
-using CodeImp.DoomBuilder.VisualModes;
-
 #endregion
 
 namespace CodeImp.DoomBuilder
diff --git a/Source/Core/General/StepsList.cs b/Source/Core/General/StepsList.cs
index cfd1e5d068f6c41d10a836e4cb7564bf9618f085..9c32e4463ec99ef737a65ae5589d9be538630b40 100644
--- a/Source/Core/General/StepsList.cs
+++ b/Source/Core/General/StepsList.cs
@@ -17,14 +17,7 @@
 #region ================== Namespaces
 
 using System;
-using System.Collections;
 using System.Collections.Generic;
-using System.Globalization;
-using System.Text;
-using CodeImp.DoomBuilder.IO;
-using CodeImp.DoomBuilder.Data;
-using System.IO;
-using System.Diagnostics;
 
 #endregion
 
diff --git a/Source/Core/Geometry/Angle2D.cs b/Source/Core/Geometry/Angle2D.cs
index 91414356f022c4515081a4a5fbfcb05437803dae..a098abaf082596306e29a1d9c7b8e63be431e019 100644
--- a/Source/Core/Geometry/Angle2D.cs
+++ b/Source/Core/Geometry/Angle2D.cs
@@ -17,10 +17,6 @@
 #region ================== Namespaces
 
 using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Text;
 
 #endregion
 
diff --git a/Source/Core/Geometry/CurveTools.cs b/Source/Core/Geometry/CurveTools.cs
index f031625233971754dceb98af672dddae2fcd77e5..9597b7496b1e511f6e687e8af71a049d1357bdd0 100644
--- a/Source/Core/Geometry/CurveTools.cs
+++ b/Source/Core/Geometry/CurveTools.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Text;
 
 namespace CodeImp.DoomBuilder.Geometry
 {
diff --git a/Source/Core/Geometry/DrawnVertex.cs b/Source/Core/Geometry/DrawnVertex.cs
index d832759004baa57a4a933943312691f00b232869..4196d6e4069832e725b8b6a35887dfc0e1356411 100644
--- a/Source/Core/Geometry/DrawnVertex.cs
+++ b/Source/Core/Geometry/DrawnVertex.cs
@@ -16,21 +16,6 @@
 
 #region ================== Namespaces
 
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Text;
-using CodeImp.DoomBuilder.IO;
-using CodeImp.DoomBuilder.Data;
-using System.IO;
-using System.Diagnostics;
-using System.Windows.Forms;
-using CodeImp.DoomBuilder.Map;
-using System.Reflection;
-using CodeImp.DoomBuilder.Plugins;
-using CodeImp.DoomBuilder.Editing;
-
 #endregion
 
 namespace CodeImp.DoomBuilder.Geometry
diff --git a/Source/Core/Geometry/EarClipPolygon.cs b/Source/Core/Geometry/EarClipPolygon.cs
index 23de81448460e84fe8409f3540d42d4b1d3e3781..0e7e3171c5f190cfcde6ab97ecaca86fc0c6026d 100644
--- a/Source/Core/Geometry/EarClipPolygon.cs
+++ b/Source/Core/Geometry/EarClipPolygon.cs
@@ -17,15 +17,8 @@
 #region ================== Namespaces
 
 using System;
-using System.Collections;
 using System.Collections.Generic;
-using System.Globalization;
-using System.Text;
-using CodeImp.DoomBuilder.Geometry;
-using CodeImp.DoomBuilder.Rendering;
-using SlimDX.Direct3D9;
 using System.Drawing;
-using CodeImp.DoomBuilder.Map;
 
 #endregion
 
diff --git a/Source/Core/Geometry/EarClipVertex.cs b/Source/Core/Geometry/EarClipVertex.cs
index 77c5f5b15344d36033cea57018f71c01103ca25d..12ec668cb112b6198e74391c07554a821fd0ea00 100644
--- a/Source/Core/Geometry/EarClipVertex.cs
+++ b/Source/Core/Geometry/EarClipVertex.cs
@@ -17,14 +17,7 @@
 #region ================== Namespaces
 
 using System;
-using System.Collections;
 using System.Collections.Generic;
-using System.Globalization;
-using System.Text;
-using CodeImp.DoomBuilder.Geometry;
-using CodeImp.DoomBuilder.Rendering;
-using SlimDX.Direct3D9;
-using System.Drawing;
 using CodeImp.DoomBuilder.Map;
 
 #endregion
diff --git a/Source/Core/Geometry/LabelPositionInfo.cs b/Source/Core/Geometry/LabelPositionInfo.cs
index 186af49eab2ef40e49cb4ccc4d56c9763d905c69..1f06e264102d3edc9b95563b8b4a740bb8496faa 100644
--- a/Source/Core/Geometry/LabelPositionInfo.cs
+++ b/Source/Core/Geometry/LabelPositionInfo.cs
@@ -16,12 +16,6 @@
 
 #region ================== Namespaces
 
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Text;
-
 #endregion
 
 namespace CodeImp.DoomBuilder.Geometry
diff --git a/Source/Core/Geometry/Line2D.cs b/Source/Core/Geometry/Line2D.cs
index 47073ea6d93d3e78b840fe84dfd3efa339fdf148..cc787775c752c3a86f86bcbf25d27d3db12db16b 100644
--- a/Source/Core/Geometry/Line2D.cs
+++ b/Source/Core/Geometry/Line2D.cs
@@ -17,10 +17,6 @@
 #region ================== Namespaces
 
 using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Text;
 
 #endregion
 
diff --git a/Source/Core/Geometry/LinedefAngleSorter.cs b/Source/Core/Geometry/LinedefAngleSorter.cs
index 9496d5da36e063f49c440b1a533dfd91c50b727f..171e2430a8cb7aa9a6a93149645817c438879359 100644
--- a/Source/Core/Geometry/LinedefAngleSorter.cs
+++ b/Source/Core/Geometry/LinedefAngleSorter.cs
@@ -17,10 +17,7 @@
 #region ================== Namespaces
 
 using System;
-using System.Collections;
 using System.Collections.Generic;
-using System.Globalization;
-using System.Text;
 using CodeImp.DoomBuilder.Map;
 
 #endregion
diff --git a/Source/Core/Geometry/LinedefSide.cs b/Source/Core/Geometry/LinedefSide.cs
index 742831752a7f910a6ab8f1a01fb4ea965fcefdda..04de4d61b39b869a9175790dfc5dac18471491e6 100644
--- a/Source/Core/Geometry/LinedefSide.cs
+++ b/Source/Core/Geometry/LinedefSide.cs
@@ -16,15 +16,6 @@
 
 #region ================== Namespaces
 
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Text;
-using CodeImp.DoomBuilder.Geometry;
-using CodeImp.DoomBuilder.Rendering;
-using SlimDX.Direct3D9;
-using System.Drawing;
 using CodeImp.DoomBuilder.Map;
 
 #endregion
diff --git a/Source/Core/Geometry/LinedefsTracePath.cs b/Source/Core/Geometry/LinedefsTracePath.cs
index 67cc104e214594e4d8b3a56006564cbb7345f436..6cbd5c94a40e7a62f3ab9d98f7ebbfdeb0cc90f6 100644
--- a/Source/Core/Geometry/LinedefsTracePath.cs
+++ b/Source/Core/Geometry/LinedefsTracePath.cs
@@ -16,15 +16,7 @@
 
 #region ================== Namespaces
 
-using System;
-using System.Collections;
 using System.Collections.Generic;
-using System.Globalization;
-using System.Text;
-using CodeImp.DoomBuilder.Geometry;
-using CodeImp.DoomBuilder.Rendering;
-using SlimDX.Direct3D9;
-using System.Drawing;
 using CodeImp.DoomBuilder.Map;
 
 #endregion
diff --git a/Source/Core/Geometry/Plane.cs b/Source/Core/Geometry/Plane.cs
index 8b0f430deffebf6e148ada9e3f9a6000451a55e8..d982bfac37e00d6d318a94dabd23963d1d5cfff9 100644
--- a/Source/Core/Geometry/Plane.cs
+++ b/Source/Core/Geometry/Plane.cs
@@ -16,12 +16,6 @@
 
 #region ================== Namespaces
 
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Text;
-
 #endregion
 
 namespace CodeImp.DoomBuilder.Geometry
diff --git a/Source/Core/Geometry/ProjectedFrustum2D.cs b/Source/Core/Geometry/ProjectedFrustum2D.cs
index 3b3662d90f20eeab3fc0a0cb110c247a96bc4d96..a07c3f5451526289307be90d58442765b4fe8dc8 100644
--- a/Source/Core/Geometry/ProjectedFrustum2D.cs
+++ b/Source/Core/Geometry/ProjectedFrustum2D.cs
@@ -17,11 +17,6 @@
 #region ================== Namespaces
 
 using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Text;
-using CodeImp.DoomBuilder.VisualModes;
 
 #endregion
 
diff --git a/Source/Core/Geometry/SidedefAngleSorter.cs b/Source/Core/Geometry/SidedefAngleSorter.cs
index 1c719f560deaf0cf5c5c4aceca0cf9f53f81383d..0c404759e8e7611bbb48868e954603b3b871fd06 100644
--- a/Source/Core/Geometry/SidedefAngleSorter.cs
+++ b/Source/Core/Geometry/SidedefAngleSorter.cs
@@ -17,10 +17,7 @@
 #region ================== Namespaces
 
 using System;
-using System.Collections;
 using System.Collections.Generic;
-using System.Globalization;
-using System.Text;
 using CodeImp.DoomBuilder.Map;
 
 #endregion
diff --git a/Source/Core/Geometry/SidedefsTracePath.cs b/Source/Core/Geometry/SidedefsTracePath.cs
index c05f6d1a5cb65ad6738851f2d6b59fe3bcb90745..846faef4ba36dc3f092b6a813349f86f02ff298b 100644
--- a/Source/Core/Geometry/SidedefsTracePath.cs
+++ b/Source/Core/Geometry/SidedefsTracePath.cs
@@ -16,15 +16,7 @@
 
 #region ================== Namespaces
 
-using System;
-using System.Collections;
 using System.Collections.Generic;
-using System.Globalization;
-using System.Text;
-using CodeImp.DoomBuilder.Geometry;
-using CodeImp.DoomBuilder.Rendering;
-using SlimDX.Direct3D9;
-using System.Drawing;
 using CodeImp.DoomBuilder.Map;
 
 #endregion
diff --git a/Source/Core/Geometry/Tools.cs b/Source/Core/Geometry/Tools.cs
index dca058995cdd9f52709e6ccdb4da72bb3adea9cd..36c023e625f54bdad3de8753acd134de31b51aed 100644
--- a/Source/Core/Geometry/Tools.cs
+++ b/Source/Core/Geometry/Tools.cs
@@ -19,18 +19,11 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
-using System.Globalization;
-using System.Text;
-using CodeImp.DoomBuilder.Geometry;
 using CodeImp.DoomBuilder.Rendering;
-using CodeImp.DoomBuilder.Windows;
 using SlimDX;
-using SlimDX.Direct3D9;
 using System.Drawing;
 using CodeImp.DoomBuilder.Map;
-using CodeImp.DoomBuilder.IO;
 using CodeImp.DoomBuilder.Data;
-using System.Threading;
 using CodeImp.DoomBuilder.Config;
 using CodeImp.DoomBuilder.Types;
 
diff --git a/Source/Core/Geometry/Triangulation.cs b/Source/Core/Geometry/Triangulation.cs
index 6b7b3be39c01c21a4c4c86fd1bc74a1c14c1a774..10428347e6de0c1d0d8b532a901c6f07edb50406 100644
--- a/Source/Core/Geometry/Triangulation.cs
+++ b/Source/Core/Geometry/Triangulation.cs
@@ -19,12 +19,6 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
-using System.Globalization;
-using System.Text;
-using CodeImp.DoomBuilder.Geometry;
-using CodeImp.DoomBuilder.Rendering;
-using SlimDX.Direct3D9;
-using System.Drawing;
 using CodeImp.DoomBuilder.Map;
 using System.Collections.ObjectModel;
 using CodeImp.DoomBuilder.IO;
diff --git a/Source/Core/Geometry/Vector2D.cs b/Source/Core/Geometry/Vector2D.cs
index 519bc229d2449bbc03ecdc13755f4b4948ec5786..20ca5c8cab523bb3a17ecb1117f12e237159e8a3 100644
--- a/Source/Core/Geometry/Vector2D.cs
+++ b/Source/Core/Geometry/Vector2D.cs
@@ -17,10 +17,6 @@
 #region ================== Namespaces
 
 using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Text;
 
 #endregion
 
diff --git a/Source/Core/Geometry/Vector3D.cs b/Source/Core/Geometry/Vector3D.cs
index f200d4a281751e339c6542850afc22e002bf4653..2c8cbb4d13c7ae6ae4b9cfb55ad3eca39c62ac4b 100644
--- a/Source/Core/Geometry/Vector3D.cs
+++ b/Source/Core/Geometry/Vector3D.cs
@@ -17,10 +17,6 @@
 #region ================== Namespaces
 
 using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Text;
 
 #endregion
 
diff --git a/Source/Core/IO/ClippedStream.cs b/Source/Core/IO/ClippedStream.cs
index aacd9ec323c8e563224236606bfd2a0858d306ee..ef6e1435978759460a2984536475ce36db02fed2 100644
--- a/Source/Core/IO/ClippedStream.cs
+++ b/Source/Core/IO/ClippedStream.cs
@@ -17,10 +17,6 @@
 #region ================== Namespaces
 
 using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Text;
 using System.IO;
 
 #endregion
diff --git a/Source/Core/IO/DeserializerStream.cs b/Source/Core/IO/DeserializerStream.cs
index 6fd35f13cf66b229587b2ca63659e7c8c0c5914c..ade11dcf4c089be7c015751f15bcf71fb4a08587 100644
--- a/Source/Core/IO/DeserializerStream.cs
+++ b/Source/Core/IO/DeserializerStream.cs
@@ -16,15 +16,8 @@
 
 #region ================== Namespaces
 
-using System;
-using System.Collections;
 using System.Collections.Generic;
-using System.Globalization;
-using System.Text;
 using CodeImp.DoomBuilder.Geometry;
-using CodeImp.DoomBuilder.Rendering;
-using SlimDX.Direct3D9;
-using System.Drawing;
 using System.IO;
 
 #endregion
diff --git a/Source/Core/IO/DirectoryFileEntry.cs b/Source/Core/IO/DirectoryFileEntry.cs
index 75250ad54d7392f5f21e76f969d486129413ecc6..65febeb8ab8b4a7a196395ce12453266cd5d765b 100644
--- a/Source/Core/IO/DirectoryFileEntry.cs
+++ b/Source/Core/IO/DirectoryFileEntry.cs
@@ -16,11 +16,6 @@
 
 #region ================== Namespaces
 
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Text;
 using System.IO;
 
 #endregion
diff --git a/Source/Core/IO/DirectoryFilesList.cs b/Source/Core/IO/DirectoryFilesList.cs
index 108049a8853bceab9c7dae75dc95e1a002aa9d5a..d440df4df7111f0d06c8c27bd3e5b817c045218b 100644
--- a/Source/Core/IO/DirectoryFilesList.cs
+++ b/Source/Core/IO/DirectoryFilesList.cs
@@ -16,11 +16,7 @@
 
 #region ================== Namespaces
 
-using System;
-using System.Collections;
 using System.Collections.Generic;
-using System.Globalization;
-using System.Text;
 using System.IO;
 
 #endregion
diff --git a/Source/Core/IO/DoomColormapReader.cs b/Source/Core/IO/DoomColormapReader.cs
index 0e8444f8576f34261e325b75a55866035c81b67c..9407c0f6ad8faee825185131292cd6309406b188 100644
--- a/Source/Core/IO/DoomColormapReader.cs
+++ b/Source/Core/IO/DoomColormapReader.cs
@@ -17,13 +17,7 @@
 #region ================== Namespaces
 
 using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Text;
 using System.IO;
-using CodeImp.DoomBuilder.Map;
-using CodeImp.DoomBuilder.Geometry;
 using System.Drawing;
 using CodeImp.DoomBuilder.Data;
 using CodeImp.DoomBuilder.Rendering;
diff --git a/Source/Core/IO/DoomFlatReader.cs b/Source/Core/IO/DoomFlatReader.cs
index baae683cf893311df441cb5cc4dd553ab03547cd..ac9ebc91403761ef991cf14759d819eade2b564e 100644
--- a/Source/Core/IO/DoomFlatReader.cs
+++ b/Source/Core/IO/DoomFlatReader.cs
@@ -17,13 +17,7 @@
 #region ================== Namespaces
 
 using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Text;
 using System.IO;
-using CodeImp.DoomBuilder.Map;
-using CodeImp.DoomBuilder.Geometry;
 using System.Drawing;
 using CodeImp.DoomBuilder.Data;
 using CodeImp.DoomBuilder.Rendering;
diff --git a/Source/Core/IO/DoomMapSetIO.cs b/Source/Core/IO/DoomMapSetIO.cs
index 0c96f4090a0903c4a07950e438e40036c2c08746..35e4199a68b44db32510add14a25494fc33c3ff5 100644
--- a/Source/Core/IO/DoomMapSetIO.cs
+++ b/Source/Core/IO/DoomMapSetIO.cs
@@ -19,8 +19,6 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
-using System.Globalization;
-using System.Text;
 using System.IO;
 using CodeImp.DoomBuilder.Map;
 using CodeImp.DoomBuilder.Geometry;
diff --git a/Source/Core/IO/DoomPictureReader.cs b/Source/Core/IO/DoomPictureReader.cs
index 6b24ebd918d9ccac1f969ff30eb3c9e19dc3eef0..18cb4b32d65a709b5153c5b3b7596ce94cf487d5 100644
--- a/Source/Core/IO/DoomPictureReader.cs
+++ b/Source/Core/IO/DoomPictureReader.cs
@@ -17,13 +17,7 @@
 #region ================== Namespaces
 
 using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Text;
 using System.IO;
-using CodeImp.DoomBuilder.Map;
-using CodeImp.DoomBuilder.Geometry;
 using System.Drawing;
 using CodeImp.DoomBuilder.Data;
 using CodeImp.DoomBuilder.Rendering;
diff --git a/Source/Core/IO/FileImageReader.cs b/Source/Core/IO/FileImageReader.cs
index ea42ee09bf98c4f91af38625d9d1b89f87379be6..7b581519e7620e338d12e572bb1da6eadb8e41ab 100644
--- a/Source/Core/IO/FileImageReader.cs
+++ b/Source/Core/IO/FileImageReader.cs
@@ -17,16 +17,9 @@
 #region ================== Namespaces
 
 using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Globalization;
 using System.Runtime.InteropServices;
-using System.Text;
 using System.IO;
-using CodeImp.DoomBuilder.Map;
-using CodeImp.DoomBuilder.Geometry;
 using System.Drawing;
-using CodeImp.DoomBuilder.Data;
 using CodeImp.DoomBuilder.Rendering;
 using System.Drawing.Imaging;
 
diff --git a/Source/Core/IO/HexenMapSetIO.cs b/Source/Core/IO/HexenMapSetIO.cs
index 77f4f4c3b23423673a564ccf9c57c6645e5266f2..dc010a66e37195e6af48dcdb72929ec6ac0c9015 100644
--- a/Source/Core/IO/HexenMapSetIO.cs
+++ b/Source/Core/IO/HexenMapSetIO.cs
@@ -19,8 +19,6 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
-using System.Globalization;
-using System.Text;
 using System.IO;
 using CodeImp.DoomBuilder.Map;
 using CodeImp.DoomBuilder.Geometry;
diff --git a/Source/Core/IO/IImageReader.cs b/Source/Core/IO/IImageReader.cs
index 8f432434fe39663fccafc15d9b132c87f695a2bd..120c47077db7e6cf902e65a287b0354646e1b135 100644
--- a/Source/Core/IO/IImageReader.cs
+++ b/Source/Core/IO/IImageReader.cs
@@ -16,18 +16,9 @@
 
 #region ================== Namespaces
 
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Text;
 using System.IO;
-using CodeImp.DoomBuilder.Map;
-using CodeImp.DoomBuilder.Geometry;
 using System.Drawing;
-using CodeImp.DoomBuilder.Data;
 using CodeImp.DoomBuilder.Rendering;
-using System.Drawing.Imaging;
 
 #endregion
 
diff --git a/Source/Core/IO/IMapSetIO.cs b/Source/Core/IO/IMapSetIO.cs
index 0e4e307eb4593ff0d46b9c0dfc4d0b10b95e0131..43bde0d0d89a46bd37d61f2901899834002f0985 100644
--- a/Source/Core/IO/IMapSetIO.cs
+++ b/Source/Core/IO/IMapSetIO.cs
@@ -16,16 +16,6 @@
 
 #region ================== Namespaces
 
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Text;
-using System.IO;
-using CodeImp.DoomBuilder.Map;
-using System.Reflection;
-using System.Diagnostics;
-
 #endregion
 
 namespace CodeImp.DoomBuilder.IO
diff --git a/Source/Core/IO/IReadWriteStream.cs b/Source/Core/IO/IReadWriteStream.cs
index 61f75ab837e1100b163f823daef6605054085555..de63c3cec62d032e8744bd635e26b75497fb0ca6 100644
--- a/Source/Core/IO/IReadWriteStream.cs
+++ b/Source/Core/IO/IReadWriteStream.cs
@@ -16,16 +16,7 @@
 
 #region ================== Namespaces
 
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Text;
 using CodeImp.DoomBuilder.Geometry;
-using CodeImp.DoomBuilder.Rendering;
-using SlimDX.Direct3D9;
-using System.Drawing;
-using System.IO;
 
 #endregion
 
diff --git a/Source/Core/IO/Lump.cs b/Source/Core/IO/Lump.cs
index 88c218770475d48ae89b3405fe35d4a09309dd27..68e9cf776071ed15a57fa16da743b38929f4f3e1 100644
--- a/Source/Core/IO/Lump.cs
+++ b/Source/Core/IO/Lump.cs
@@ -17,9 +17,6 @@
 #region ================== Namespaces
 
 using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Globalization;
 using System.Text;
 using System.IO;
 
diff --git a/Source/Core/IO/MapSetIO.cs b/Source/Core/IO/MapSetIO.cs
index 92ffb524bb6dc9f4be37ce52c093b62812f19dbb..d02b8faacb684989a5e24759c4bc3b1221d0af35 100644
--- a/Source/Core/IO/MapSetIO.cs
+++ b/Source/Core/IO/MapSetIO.cs
@@ -17,11 +17,7 @@
 #region ================== Namespaces
 
 using System;
-using System.Collections;
-using System.Collections.Generic;
 using System.Globalization;
-using System.Text;
-using System.IO;
 using CodeImp.DoomBuilder.Map;
 using System.Reflection;
 using System.Diagnostics;
diff --git a/Source/Core/IO/SerializerStream.cs b/Source/Core/IO/SerializerStream.cs
index 55e59ddc11b72384f1cf9b590e7f9f9175615b51..c8c8e5c5e1e3eec071a1daf7e5f7bbb4876c23fd 100644
--- a/Source/Core/IO/SerializerStream.cs
+++ b/Source/Core/IO/SerializerStream.cs
@@ -16,15 +16,8 @@
 
 #region ================== Namespaces
 
-using System;
-using System.Collections;
 using System.Collections.Generic;
-using System.Globalization;
-using System.Text;
 using CodeImp.DoomBuilder.Geometry;
-using CodeImp.DoomBuilder.Rendering;
-using SlimDX.Direct3D9;
-using System.Drawing;
 using System.IO;
 
 #endregion
diff --git a/Source/Core/IO/UniversalCollection.cs b/Source/Core/IO/UniversalCollection.cs
index ec4aa1a4183203aa569b83f00bdc523ce96b54e5..231c5bbf65fa51adcfe61b917caa8d1766b3acb2 100644
--- a/Source/Core/IO/UniversalCollection.cs
+++ b/Source/Core/IO/UniversalCollection.cs
@@ -16,12 +16,6 @@
 
 #region ================== Namespaces
 
-using System;
-using System.IO;
-using System.Text;
-using System.Globalization;
-using System.Collections;
-using System.Collections.Specialized;
 using System.Collections.Generic;
 
 #endregion
diff --git a/Source/Core/IO/UniversalEntry.cs b/Source/Core/IO/UniversalEntry.cs
index 8e925db16cf37cdb456412f5df4ed56bf5806d75..fcda8de68618138b02edf5f4cbc3c88ceba31759 100644
--- a/Source/Core/IO/UniversalEntry.cs
+++ b/Source/Core/IO/UniversalEntry.cs
@@ -17,11 +17,6 @@
 #region ================== Namespaces
 
 using System;
-using System.IO;
-using System.Text;
-using System.Globalization;
-using System.Collections;
-using System.Collections.Specialized;
 
 #endregion
 
diff --git a/Source/Core/IO/UniversalMapSetIO.cs b/Source/Core/IO/UniversalMapSetIO.cs
index 4f2244209aff0aea8ca1880673b62af4b569c33f..750894dfd746ac3574306ce18fdd265802508bab 100644
--- a/Source/Core/IO/UniversalMapSetIO.cs
+++ b/Source/Core/IO/UniversalMapSetIO.cs
@@ -17,16 +17,11 @@
 #region ================== Namespaces
 
 using System;
-using System.Collections;
 using System.Collections.Generic;
-using System.Globalization;
 using System.Text;
 using System.IO;
 using CodeImp.DoomBuilder.Map;
-using CodeImp.DoomBuilder.Geometry;
-using System.Windows.Forms;
 using CodeImp.DoomBuilder.Config;
-using CodeImp.DoomBuilder.Types;
 
 #endregion
 
diff --git a/Source/Core/IO/UniversalParser.cs b/Source/Core/IO/UniversalParser.cs
index feaa205b7748785796af70ad03e8695273e9f1a9..3cc9bf7bf85b1d041b992c090c12dc547c9e29c4 100644
--- a/Source/Core/IO/UniversalParser.cs
+++ b/Source/Core/IO/UniversalParser.cs
@@ -21,7 +21,6 @@ using System.IO;
 using System.Text;
 using System.Globalization;
 using System.Collections;
-using System.Collections.Specialized;
 using System.Collections.Generic;
 
 #endregion
diff --git a/Source/Core/IO/UniversalStreamReader.cs b/Source/Core/IO/UniversalStreamReader.cs
index 7e03d0e4cb0f5f6e90e3fd5ba194952a36107c2a..f4f292a85246a166afb3270c66583289d46d16b2 100644
--- a/Source/Core/IO/UniversalStreamReader.cs
+++ b/Source/Core/IO/UniversalStreamReader.cs
@@ -17,9 +17,7 @@
 #region ================== Namespaces
 
 using System;
-using System.Collections;
 using System.Collections.Generic;
-using System.Globalization;
 using System.Text;
 using System.IO;
 using CodeImp.DoomBuilder.Map;
diff --git a/Source/Core/IO/UniversalStreamWriter.cs b/Source/Core/IO/UniversalStreamWriter.cs
index a40060f234587a90436c77484abc8b4e3781cdcc..06933f862cdd9ee38a902ce661ea23b52c3a8db5 100644
--- a/Source/Core/IO/UniversalStreamWriter.cs
+++ b/Source/Core/IO/UniversalStreamWriter.cs
@@ -17,16 +17,11 @@
 #region ================== Namespaces
 
 using System;
-using System.Collections;
 using System.Collections.Generic;
-using System.Globalization;
 using System.Text;
 using System.IO;
 using CodeImp.DoomBuilder.Map;
-using CodeImp.DoomBuilder.Geometry;
-using System.Windows.Forms;
 using CodeImp.DoomBuilder.Config;
-using CodeImp.DoomBuilder.Types;
 
 #endregion
 
diff --git a/Source/Core/IO/UnknownImageReader.cs b/Source/Core/IO/UnknownImageReader.cs
index 7e82e34094a984ea6742518a57424046abb2e52a..1860e063bd6c2c02392859f07433af9b43c299e6 100644
--- a/Source/Core/IO/UnknownImageReader.cs
+++ b/Source/Core/IO/UnknownImageReader.cs
@@ -17,15 +17,8 @@
 #region ================== Namespaces
 
 using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Text;
 using System.IO;
-using CodeImp.DoomBuilder.Map;
-using CodeImp.DoomBuilder.Geometry;
 using System.Drawing;
-using CodeImp.DoomBuilder.Data;
 using CodeImp.DoomBuilder.Rendering;
 using System.Drawing.Imaging;
 
diff --git a/Source/Core/IO/WAD.cs b/Source/Core/IO/WAD.cs
index 6af02a270d5228878fa7dd4a2adad88eab9d1ba2..c6dd02b49d8c9778b6adbe65253381f9c25160ef 100644
--- a/Source/Core/IO/WAD.cs
+++ b/Source/Core/IO/WAD.cs
@@ -16,10 +16,7 @@
 
 #region ================== Namespaces
 
-using System;
-using System.Collections;
 using System.Collections.Generic;
-using System.Globalization;
 using System.Text;
 using System.IO;
 
diff --git a/Source/Core/Map/BlockEntry.cs b/Source/Core/Map/BlockEntry.cs
index 8defcfd364c43a768296e340d6f9560dc05feb3c..06ade5d463b9480a222d2f95f4dbc81bd33c177e 100644
--- a/Source/Core/Map/BlockEntry.cs
+++ b/Source/Core/Map/BlockEntry.cs
@@ -16,23 +16,7 @@
 
 #region ================== Namespaces
 
-using System;
-using System.Collections;
 using System.Collections.Generic;
-using System.Globalization;
-using System.Text;
-using System.Windows.Forms;
-using System.IO;
-using System.Reflection;
-using CodeImp.DoomBuilder.Windows;
-using CodeImp.DoomBuilder.IO;
-using CodeImp.DoomBuilder.Map;
-using CodeImp.DoomBuilder.Rendering;
-using CodeImp.DoomBuilder.Actions;
-using CodeImp.DoomBuilder.Geometry;
-using System.Drawing;
-using SlimDX;
-using CodeImp.DoomBuilder.Editing;
 
 #endregion
 
diff --git a/Source/Core/Map/BlockMap.cs b/Source/Core/Map/BlockMap.cs
index 9fdcfc82cdf918efc7dc04b8de60644be2439244..0eedda01566db04aa5664465005b359b61cc3fea 100644
--- a/Source/Core/Map/BlockMap.cs
+++ b/Source/Core/Map/BlockMap.cs
@@ -17,22 +17,9 @@
 #region ================== Namespaces
 
 using System;
-using System.Collections;
 using System.Collections.Generic;
-using System.Globalization;
-using System.Text;
-using System.Windows.Forms;
-using System.IO;
-using System.Reflection;
-using CodeImp.DoomBuilder.Windows;
-using CodeImp.DoomBuilder.IO;
-using CodeImp.DoomBuilder.Map;
-using CodeImp.DoomBuilder.Rendering;
-using CodeImp.DoomBuilder.Actions;
 using CodeImp.DoomBuilder.Geometry;
 using System.Drawing;
-using SlimDX;
-using CodeImp.DoomBuilder.Editing;
 
 #endregion
 
diff --git a/Source/Core/Map/GroupInfo.cs b/Source/Core/Map/GroupInfo.cs
index 61ad6f67ef784ff4c2ad0f67ccba21a8b017f708..4f7a4496d028800de48d7fd8174f9bafbd80a63d 100644
--- a/Source/Core/Map/GroupInfo.cs
+++ b/Source/Core/Map/GroupInfo.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace CodeImp.DoomBuilder.Map
+namespace CodeImp.DoomBuilder.Map
 {
 	public class GroupInfo
 	{
diff --git a/Source/Core/Map/Linedef.cs b/Source/Core/Map/Linedef.cs
index b07602bbd637d609cfdb99fbc13f6ac99c5a1d3e..2e0b22a9cfb07bd02974f7064228357bdd1d04cf 100644
--- a/Source/Core/Map/Linedef.cs
+++ b/Source/Core/Map/Linedef.cs
@@ -17,14 +17,9 @@
 #region ================== Namespaces
 
 using System;
-using System.Collections;
 using System.Collections.Generic;
-using System.Globalization;
-using System.Text;
 using CodeImp.DoomBuilder.Config;
 using CodeImp.DoomBuilder.Geometry;
-using CodeImp.DoomBuilder.Rendering;
-using SlimDX.Direct3D9;
 using System.Drawing;
 using CodeImp.DoomBuilder.IO;
 using CodeImp.DoomBuilder.Types;
diff --git a/Source/Core/Map/MapElement.cs b/Source/Core/Map/MapElement.cs
index 810d2142fde4b0c4e6990182d72f436b842e7910..e722d5ca33fe507a9b01f8502d505ed0c1406394 100644
--- a/Source/Core/Map/MapElement.cs
+++ b/Source/Core/Map/MapElement.cs
@@ -17,14 +17,7 @@
 #region ================== Namespaces
 
 using System;
-using System.Collections;
 using System.Collections.Generic;
-using System.Globalization;
-using System.Text;
-using CodeImp.DoomBuilder.Geometry;
-using CodeImp.DoomBuilder.Rendering;
-using SlimDX.Direct3D9;
-using System.Drawing;
 using CodeImp.DoomBuilder.IO;
 
 #endregion
diff --git a/Source/Core/Map/MapElementCollection.cs b/Source/Core/Map/MapElementCollection.cs
index 15a821634e7817c2b5c0ea50bb43f7230c21b22c..925eede4910f2a49ccac98ce01aca657245d60f6 100644
--- a/Source/Core/Map/MapElementCollection.cs
+++ b/Source/Core/Map/MapElementCollection.cs
@@ -17,9 +17,6 @@
 #region ================== Namespaces
 
 using System;
-using System.Drawing;
-using SlimDX.Direct3D9;
-using SlimDX;
 using System.Collections;
 using System.Collections.Generic;
 
diff --git a/Source/Core/Map/MapOptions.cs b/Source/Core/Map/MapOptions.cs
index 0b59c8b3b075c11ed8cbe9261e0df1d728501ed0..aa3b3c9e1d85fff7dbe17533c54b30083d76cab7 100644
--- a/Source/Core/Map/MapOptions.cs
+++ b/Source/Core/Map/MapOptions.cs
@@ -16,16 +16,13 @@
 
 #region ================== Namespaces
 
-using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Globalization;
 using System.Reflection;
-using System.Text;
 using CodeImp.DoomBuilder.IO;
 using System.IO;
 using CodeImp.DoomBuilder.Data;
-using CodeImp.DoomBuilder.Config;
 using CodeImp.DoomBuilder.Plugins;
 using System.Collections.Specialized;
 
diff --git a/Source/Core/Map/MapSet.cs b/Source/Core/Map/MapSet.cs
index ceb6c9eb04d6cad814b5e75e7a7d0798949fb557..cc7bf4e5c0bb86ec6132370d0c1412ee620e80eb 100644
--- a/Source/Core/Map/MapSet.cs
+++ b/Source/Core/Map/MapSet.cs
@@ -19,15 +19,9 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
-using System.Globalization;
-using System.Text;
 using CodeImp.DoomBuilder.Geometry;
 using CodeImp.DoomBuilder.Windows;
-using SlimDX.Direct3D9;
-using CodeImp.DoomBuilder.Rendering;
-using SlimDX;
 using System.Drawing;
-using CodeImp.DoomBuilder.Editing;
 using CodeImp.DoomBuilder.IO;
 using CodeImp.DoomBuilder.Types;
 using System.IO;
diff --git a/Source/Core/Map/Sector.cs b/Source/Core/Map/Sector.cs
index 791a0e06aef805b0e48daec07f1eec68ec601b3c..fa2caf06f93e5b04af5a71919b2cf6a160ac396d 100644
--- a/Source/Core/Map/Sector.cs
+++ b/Source/Core/Map/Sector.cs
@@ -17,17 +17,12 @@
 #region ================== Namespaces
 
 using System;
-using System.Collections;
 using System.Collections.Generic;
-using System.Globalization;
-using System.Text;
 using CodeImp.DoomBuilder.IO;
 using CodeImp.DoomBuilder.Geometry;
 using System.Drawing;
 using CodeImp.DoomBuilder.Rendering;
 using System.Collections.ObjectModel;
-using SlimDX.Direct3D9;
-using SlimDX;
 
 #endregion
 
diff --git a/Source/Core/Map/SelectableElement.cs b/Source/Core/Map/SelectableElement.cs
index 6a84b5194879e98414b79d55ad736b06c5ad6c0f..67707ee683100334c1febafaa075d030d1e56959 100644
--- a/Source/Core/Map/SelectableElement.cs
+++ b/Source/Core/Map/SelectableElement.cs
@@ -16,16 +16,6 @@
 
 #region ================== Namespaces
 
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Text;
-using CodeImp.DoomBuilder.Geometry;
-using CodeImp.DoomBuilder.Rendering;
-using SlimDX.Direct3D9;
-using System.Drawing;
-
 #endregion
 
 namespace CodeImp.DoomBuilder.Map
diff --git a/Source/Core/Map/SelectionType.cs b/Source/Core/Map/SelectionType.cs
index 2810245e8739b925513395665d79cfeb1940e856..d0562a50a7649a2f208238b955a97befcbf2abfc 100644
--- a/Source/Core/Map/SelectionType.cs
+++ b/Source/Core/Map/SelectionType.cs
@@ -17,14 +17,6 @@
 #region ================== Namespaces
 
 using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Text;
-using CodeImp.DoomBuilder.Geometry;
-using CodeImp.DoomBuilder.Rendering;
-using SlimDX.Direct3D9;
-using System.Drawing;
 
 #endregion
 
diff --git a/Source/Core/Map/Sidedef.cs b/Source/Core/Map/Sidedef.cs
index 94e6772ec448f1228192fe94b4b8c1d2da492c81..203bdc00e228f07f4fffc861999e845d613685f8 100644
--- a/Source/Core/Map/Sidedef.cs
+++ b/Source/Core/Map/Sidedef.cs
@@ -17,13 +17,9 @@
 #region ================== Namespaces
 
 using System;
-using System.Collections;
 using System.Collections.Generic;
-using System.Globalization;
-using System.Text;
 using CodeImp.DoomBuilder.IO;
 using CodeImp.DoomBuilder.Geometry;
-using CodeImp.DoomBuilder.Types;
 
 #endregion
 
diff --git a/Source/Core/Map/SidedefPart.cs b/Source/Core/Map/SidedefPart.cs
index 265605c85d8f0da1a1f69901cc039202dec73578..2535979e87deb082ffa38936a874408e6c8e52cb 100644
--- a/Source/Core/Map/SidedefPart.cs
+++ b/Source/Core/Map/SidedefPart.cs
@@ -16,12 +16,6 @@
 
 #region ================== Namespaces
 
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Text;
-
 #endregion
 
 namespace CodeImp.DoomBuilder.Map
diff --git a/Source/Core/Map/Thing.cs b/Source/Core/Map/Thing.cs
index 752177137a3b0cc3b0af71d6f84d51d2af3cc670..53dc67a0e1d97a0a009b163dc93225510ca9011e 100644
--- a/Source/Core/Map/Thing.cs
+++ b/Source/Core/Map/Thing.cs
@@ -17,19 +17,13 @@
 #region ================== Namespaces
 
 using System;
-using System.Collections;
 using System.Collections.Generic;
-using System.Globalization;
-using System.Text;
 using CodeImp.DoomBuilder.Geometry;
 using CodeImp.DoomBuilder.Rendering;
 using CodeImp.DoomBuilder.Config;
-using System.Drawing;
 using CodeImp.DoomBuilder.IO;
 using CodeImp.DoomBuilder.VisualModes;
 
-using CodeImp.DoomBuilder.GZBuilder.Data;
-
 #endregion
 
 namespace CodeImp.DoomBuilder.Map
diff --git a/Source/Core/Map/UniFields.cs b/Source/Core/Map/UniFields.cs
index b7aaab6d6952a80bc1d1444aed12b2778cb174c9..0cf9d214972628ed7cf786f0eb8d6cb7993b275c 100644
--- a/Source/Core/Map/UniFields.cs
+++ b/Source/Core/Map/UniFields.cs
@@ -1,10 +1,7 @@
 #region ================== Namespaces
 
 using System;
-using System.Collections;
 using System.Collections.Generic;
-using System.Globalization;
-using System.Text;
 
 #endregion
 
diff --git a/Source/Core/Map/UniValue.cs b/Source/Core/Map/UniValue.cs
index eeb9b147b3b8c8bd0886597905f7317fc0c857b8..ea2fb98876295de7f99c75578b5d210117e05aad 100644
--- a/Source/Core/Map/UniValue.cs
+++ b/Source/Core/Map/UniValue.cs
@@ -17,14 +17,6 @@
 #region ================== Namespaces
 
 using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Text;
-using CodeImp.DoomBuilder.Geometry;
-using CodeImp.DoomBuilder.Rendering;
-using SlimDX.Direct3D9;
-using System.Drawing;
 using CodeImp.DoomBuilder.Types;
 using CodeImp.DoomBuilder.IO;
 
diff --git a/Source/Core/Map/Vertex.cs b/Source/Core/Map/Vertex.cs
index d513f7f9d226f73c41bc3824b59960bb0f893d23..dacbd470372ccafee91744dab054688b7d412a52 100644
--- a/Source/Core/Map/Vertex.cs
+++ b/Source/Core/Map/Vertex.cs
@@ -17,14 +17,8 @@
 #region ================== Namespaces
 
 using System;
-using System.Collections;
 using System.Collections.Generic;
-using System.Globalization;
-using System.Text;
 using CodeImp.DoomBuilder.Geometry;
-using CodeImp.DoomBuilder.Rendering;
-using SlimDX.Direct3D9;
-using System.Drawing;
 using CodeImp.DoomBuilder.IO;
 
 #endregion
diff --git a/Source/Core/Plugins/Plug.cs b/Source/Core/Plugins/Plug.cs
index 594a9957e906a428152dec304e313bc37b73ff18..d258b504cc8b79045e36db1d4e0abbdf9107b9c7 100644
--- a/Source/Core/Plugins/Plug.cs
+++ b/Source/Core/Plugins/Plug.cs
@@ -2,20 +2,14 @@
 
 using System;
 using System.Drawing;
-using System.Collections;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Text;
 using System.IO;
 using System.Windows.Forms;
 using CodeImp.DoomBuilder.Editing;
 using CodeImp.DoomBuilder.Geometry;
 using CodeImp.DoomBuilder.Rendering;
-using CodeImp.DoomBuilder.Data;
 using CodeImp.DoomBuilder.Map;
 using CodeImp.DoomBuilder.Windows;
 using CodeImp.DoomBuilder.Config;
-//using CodeImp.DoomBuilder.Types;
 
 #endregion
 
diff --git a/Source/Core/Plugins/Plugin.cs b/Source/Core/Plugins/Plugin.cs
index 14d00291496fc88ecb2afefe465e9141de54e3e4..e89f2f8cee25afc5a1b2f68a8e5e8b7a448bf794 100644
--- a/Source/Core/Plugins/Plugin.cs
+++ b/Source/Core/Plugins/Plugin.cs
@@ -17,14 +17,10 @@
 #region ================== Namespaces
 
 using System;
-using System.Collections;
 using System.Collections.Generic;
 using System.Globalization;
-using System.Text;
 using System.IO;
 using System.Reflection;
-using CodeImp.DoomBuilder.Actions;
-using CodeImp.DoomBuilder.Editing;
 
 #endregion
 
diff --git a/Source/Core/Plugins/PluginManager.cs b/Source/Core/Plugins/PluginManager.cs
index 442951f52ee28d1f590abb9998747cac283d58e4..aa877f4524f35840af72957ee8beaf29ecb6762d 100644
--- a/Source/Core/Plugins/PluginManager.cs
+++ b/Source/Core/Plugins/PluginManager.cs
@@ -19,8 +19,6 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
-using System.Globalization;
-using System.Text;
 using System.IO;
 using System.Windows.Forms;
 using CodeImp.DoomBuilder.Editing;
diff --git a/Source/Core/Rendering/ColorCollection.cs b/Source/Core/Rendering/ColorCollection.cs
index e79571b9497ab79bb850dcb2544603c17a5ca36b..7e146c1e0f9e182d18597e27275245cfa22cc141 100644
--- a/Source/Core/Rendering/ColorCollection.cs
+++ b/Source/Core/Rendering/ColorCollection.cs
@@ -17,14 +17,8 @@
 #region ================== Namespaces
 
 using System;
-using System.Collections;
-using System.Collections.Generic;
 using System.Globalization;
-using System.Text;
-using System.Reflection;
 using System.Drawing;
-using CodeImp.DoomBuilder.IO;
-using SlimDX.Direct3D9;
 using SlimDX;
 
 using Configuration = CodeImp.DoomBuilder.IO.Configuration;
diff --git a/Source/Core/Rendering/ColorSetting.cs b/Source/Core/Rendering/ColorSetting.cs
index 02ba90b78cefa2481bbcdd70a1b9acb78d01026b..6eb67d7c094af9db4b46fd1284713ce7893bef95 100644
--- a/Source/Core/Rendering/ColorSetting.cs
+++ b/Source/Core/Rendering/ColorSetting.cs
@@ -17,11 +17,6 @@
 #region ================== Namespaces
 
 using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Text;
-using System.Reflection;
 using System.Drawing;
 
 #endregion
diff --git a/Source/Core/Rendering/D3DDevice.cs b/Source/Core/Rendering/D3DDevice.cs
index 82e8ffc0b3a4576c796d507009b4f06eec2e072f..37c21deb74c1309ad319f21a3f350c38f5771e40 100644
--- a/Source/Core/Rendering/D3DDevice.cs
+++ b/Source/Core/Rendering/D3DDevice.cs
@@ -17,22 +17,14 @@
 #region ================== Namespaces
 
 using System;
-using System.Collections;
 using System.Collections.Generic;
-using System.Globalization;
-using System.Text;
 using System.Windows.Forms;
-using System.IO;
-using System.Reflection;
 using System.Drawing;
 using SlimDX.Direct3D9;
 using System.ComponentModel;
 using CodeImp.DoomBuilder.Geometry;
 using SlimDX;
-using CodeImp.DoomBuilder.Windows;
 using CodeImp.DoomBuilder.Data;
-
-using Configuration = CodeImp.DoomBuilder.IO.Configuration;
 using CodeImp.DoomBuilder.Controls;
 
 #endregion
diff --git a/Source/Core/Rendering/D3DShader.cs b/Source/Core/Rendering/D3DShader.cs
index f9f124bd933b7e70683b8d1a535347495b446bfd..abda03d8ad4edec80b937b594df5fc9881b34680 100644
--- a/Source/Core/Rendering/D3DShader.cs
+++ b/Source/Core/Rendering/D3DShader.cs
@@ -17,20 +17,8 @@
 #region ================== Namespaces
 
 using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Text;
-using System.Windows.Forms;
 using System.IO;
-using System.Reflection;
-using System.Drawing;
-using System.ComponentModel;
-using CodeImp.DoomBuilder.Map;
 using SlimDX.Direct3D9;
-using SlimDX;
-using CodeImp.DoomBuilder.Geometry;
-using System.Drawing.Imaging;
 
 #endregion
 
diff --git a/Source/Core/Rendering/Display2DShader.cs b/Source/Core/Rendering/Display2DShader.cs
index 9e07c0451651fed2b77a8d5da230e6235d578ec4..68a65c28fc1ad0fc0a32f9dd7f76eb01c11a3412 100644
--- a/Source/Core/Rendering/Display2DShader.cs
+++ b/Source/Core/Rendering/Display2DShader.cs
@@ -17,20 +17,8 @@
 #region ================== Namespaces
 
 using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Text;
-using System.Windows.Forms;
-using System.IO;
-using System.Reflection;
-using System.Drawing;
-using System.ComponentModel;
-using CodeImp.DoomBuilder.Map;
 using SlimDX.Direct3D9;
 using SlimDX;
-using CodeImp.DoomBuilder.Geometry;
-using System.Drawing.Imaging;
 
 #endregion
 
diff --git a/Source/Core/Rendering/FlatQuad.cs b/Source/Core/Rendering/FlatQuad.cs
index f649649471c811ffe77f4be99812507a7a176e4d..9faf759f6e21a6dfee2ddc75d0ad25516c65ec09 100644
--- a/Source/Core/Rendering/FlatQuad.cs
+++ b/Source/Core/Rendering/FlatQuad.cs
@@ -19,7 +19,6 @@
 using System;
 using System.Drawing;
 using SlimDX.Direct3D9;
-using SlimDX;
 
 #endregion
 
diff --git a/Source/Core/Rendering/FlatVertex.cs b/Source/Core/Rendering/FlatVertex.cs
index 49b3ea1e28296bf179eca952314c3b4fc53b1ae1..4e645233cf4ceb0e38edbb109d7dde4dd6f8a93c 100644
--- a/Source/Core/Rendering/FlatVertex.cs
+++ b/Source/Core/Rendering/FlatVertex.cs
@@ -16,22 +16,6 @@
 
 #region ================== Namespaces
 
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Text;
-using System.Windows.Forms;
-using System.IO;
-using System.Reflection;
-using System.Drawing;
-using System.ComponentModel;
-using CodeImp.DoomBuilder.Map;
-using SlimDX.Direct3D9;
-using SlimDX;
-using CodeImp.DoomBuilder.Geometry;
-using System.Drawing.Imaging;
-
 #endregion
 
 namespace CodeImp.DoomBuilder.Rendering
diff --git a/Source/Core/Rendering/ID3DResource.cs b/Source/Core/Rendering/ID3DResource.cs
index aad897026c65b3612b9bfbf1e5c9cc982a3c2367..ac2e792cd2c198f97d97ed0c53ca4f939aca6c2f 100644
--- a/Source/Core/Rendering/ID3DResource.cs
+++ b/Source/Core/Rendering/ID3DResource.cs
@@ -16,20 +16,6 @@
 
 #region ================== Namespaces
 
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Text;
-using System.Windows.Forms;
-using System.IO;
-using System.Reflection;
-using System.Drawing;
-using SlimDX.Direct3D9;
-using System.ComponentModel;
-using CodeImp.DoomBuilder.Geometry;
-using SlimDX;
-
 #endregion
 
 namespace CodeImp.DoomBuilder.Rendering
diff --git a/Source/Core/Rendering/IRenderer2D.cs b/Source/Core/Rendering/IRenderer2D.cs
index 5772cc78b892ea3b3d39dd4a88d6bf57c0ddf50d..556f2f725f49490854ce3f3ea92f63c5e9a6bd85 100644
--- a/Source/Core/Rendering/IRenderer2D.cs
+++ b/Source/Core/Rendering/IRenderer2D.cs
@@ -16,23 +16,11 @@
 
 #region ================== Namespaces
 
-using System;
-using System.Collections;
 using System.Collections.Generic;
-using System.Globalization;
-using System.Text;
-using System.Windows.Forms;
-using System.IO;
-using System.Reflection;
 using System.Drawing;
-using System.ComponentModel;
 using CodeImp.DoomBuilder.Map;
-using SlimDX.Direct3D9;
-using SlimDX;
 using CodeImp.DoomBuilder.Geometry;
-using System.Drawing.Imaging;
 using CodeImp.DoomBuilder.Data;
-using CodeImp.DoomBuilder.Editing;
 using CodeImp.DoomBuilder.GZBuilder.Geometry;
 
 #endregion
diff --git a/Source/Core/Rendering/IRenderer3D.cs b/Source/Core/Rendering/IRenderer3D.cs
index ece9b45ff25294da7f4cacf55285c9a336015a5a..0340c4b1749bdf4199f4ab7c530cfbfd81fb5c93 100644
--- a/Source/Core/Rendering/IRenderer3D.cs
+++ b/Source/Core/Rendering/IRenderer3D.cs
@@ -16,23 +16,8 @@
 
 #region ================== Namespaces
 
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Text;
-using System.Windows.Forms;
-using System.IO;
-using System.Reflection;
-using System.Drawing;
-using System.ComponentModel;
 using CodeImp.DoomBuilder.Map;
-using SlimDX.Direct3D9;
-using SlimDX;
 using CodeImp.DoomBuilder.Geometry;
-using System.Drawing.Imaging;
-using CodeImp.DoomBuilder.Data;
-using CodeImp.DoomBuilder.Editing;
 using CodeImp.DoomBuilder.VisualModes;
 
 #endregion
diff --git a/Source/Core/Rendering/PixelColor.cs b/Source/Core/Rendering/PixelColor.cs
index b0370d231082e2b42be28f2b322ce5690484b947..45c93639d3916e1f5c526fcb0628fd825723e030 100644
--- a/Source/Core/Rendering/PixelColor.cs
+++ b/Source/Core/Rendering/PixelColor.cs
@@ -16,14 +16,7 @@
 
 #region ================== Namespaces
 
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Text;
-using System.Reflection;
 using System.Drawing;
-using SlimDX.Direct3D9;
 using SlimDX;
 
 #endregion
diff --git a/Source/Core/Rendering/PixelColorBlock.cs b/Source/Core/Rendering/PixelColorBlock.cs
index a5e44dc482dff1b3967ccaa35efb5218598bf165..965b80b216206240f3846c9c7338b37e7e52a050 100644
--- a/Source/Core/Rendering/PixelColorBlock.cs
+++ b/Source/Core/Rendering/PixelColorBlock.cs
@@ -17,13 +17,6 @@
 #region ================== Namespaces
 
 using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Text;
-using System.Reflection;
-using System.Drawing;
-using SlimDX.Direct3D9;
 using System.Runtime.InteropServices;
 
 #endregion
diff --git a/Source/Core/Rendering/Plotter.cs b/Source/Core/Rendering/Plotter.cs
index 8101341f4d1067de3d96ba01c62b3fcf1f608a08..7b383be5ab9de12d40775a65610815ae2ff005d5 100644
--- a/Source/Core/Rendering/Plotter.cs
+++ b/Source/Core/Rendering/Plotter.cs
@@ -17,20 +17,6 @@
 #region ================== Namespaces
 
 using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Text;
-using System.Windows.Forms;
-using System.IO;
-using System.Reflection;
-using System.Drawing;
-using System.ComponentModel;
-using CodeImp.DoomBuilder.Map;
-using SlimDX.Direct3D9;
-using SlimDX;
-using CodeImp.DoomBuilder.Geometry;
-using System.Drawing.Imaging;
 
 #endregion
 
diff --git a/Source/Core/Rendering/Presentation.cs b/Source/Core/Rendering/Presentation.cs
index ff2fa6a02637cd014dfd01fc24583bec4d740211..2a4457863ea265e861b619b1ef743649074e639a 100644
--- a/Source/Core/Rendering/Presentation.cs
+++ b/Source/Core/Rendering/Presentation.cs
@@ -16,11 +16,7 @@
 
 #region ================== Namespaces
 
-using System;
-using System.Collections;
 using System.Collections.Generic;
-using System.Globalization;
-using System.Text;
 
 #endregion
 
diff --git a/Source/Core/Rendering/RenderLayers.cs b/Source/Core/Rendering/RenderLayers.cs
index 20e5fb594217d4292b5c2dbba928c72adbf2cb5f..247419cb7d4e0e7d38128f4960dab1c7557606c2 100644
--- a/Source/Core/Rendering/RenderLayers.cs
+++ b/Source/Core/Rendering/RenderLayers.cs
@@ -1,11 +1,5 @@
 #region ================== Namespaces
 
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Text;
-
 #endregion
 
 namespace CodeImp.DoomBuilder.Rendering
diff --git a/Source/Core/Rendering/RenderPasses.cs b/Source/Core/Rendering/RenderPasses.cs
index a44fbffa590d9d253f2ff43e0a9338198b5a1524..3c33ccd189535b0d601c74df83559c4c79a5dcfa 100644
--- a/Source/Core/Rendering/RenderPasses.cs
+++ b/Source/Core/Rendering/RenderPasses.cs
@@ -16,23 +16,6 @@
 
 #region ================== Namespaces
 
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Text;
-using System.Windows.Forms;
-using System.IO;
-using System.Reflection;
-using System.Drawing;
-using System.ComponentModel;
-using SlimDX;
-using CodeImp.DoomBuilder.Geometry;
-using SlimDX.Direct3D9;
-using CodeImp.DoomBuilder.Data;
-using CodeImp.DoomBuilder.VisualModes;
-using CodeImp.DoomBuilder.Map;
-
 #endregion
 
 namespace CodeImp.DoomBuilder.Rendering
diff --git a/Source/Core/Rendering/Renderer.cs b/Source/Core/Rendering/Renderer.cs
index 03d442c86953605c74510870bcd41a71219bcf5f..f0ab5b0b4969f94f509fc346c34f707c8e5341c1 100644
--- a/Source/Core/Rendering/Renderer.cs
+++ b/Source/Core/Rendering/Renderer.cs
@@ -17,11 +17,6 @@
 #region ================== Namespaces
 
 using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Text;
-
 using CodeImp.DoomBuilder.Map;
 using CodeImp.DoomBuilder.Geometry;
 
diff --git a/Source/Core/Rendering/Renderer2D.cs b/Source/Core/Rendering/Renderer2D.cs
index 425e949c2410d9d610a32d8c6b326296de487b8d..5a8c5d4e7ca92ea35e88ea7ea1346815e0ef175c 100644
--- a/Source/Core/Rendering/Renderer2D.cs
+++ b/Source/Core/Rendering/Renderer2D.cs
@@ -17,28 +17,17 @@
 #region ================== Namespaces
 
 using System;
-using System.Collections;
 using System.Collections.Generic;
 using System.Globalization;
-using System.Text;
-using System.Windows.Forms;
-using System.IO;
-using System.Reflection;
 using System.Drawing;
-using System.ComponentModel;
-using CodeImp.DoomBuilder.IO;
 using CodeImp.DoomBuilder.Map;
 using SlimDX.Direct3D9;
 using SlimDX;
 using CodeImp.DoomBuilder.Geometry;
-using System.Drawing.Imaging;
 using CodeImp.DoomBuilder.Data;
 using CodeImp.DoomBuilder.Editing;
-
-//mxd
-using CodeImp.DoomBuilder.GZBuilder.Data;
-using CodeImp.DoomBuilder.GZBuilder.MD3;
-using CodeImp.DoomBuilder.GZBuilder.Geometry;
+using CodeImp.DoomBuilder.GZBuilder.Data; //mxd
+using CodeImp.DoomBuilder.GZBuilder.Geometry; //mxd
 
 #endregion
 
diff --git a/Source/Core/Rendering/Renderer3D.cs b/Source/Core/Rendering/Renderer3D.cs
index 9ab453566d38e34f587e51564073039c7e939f09..a614793b9be73ba1ec683d6fb3f8c9396ff563e5 100644
--- a/Source/Core/Rendering/Renderer3D.cs
+++ b/Source/Core/Rendering/Renderer3D.cs
@@ -17,27 +17,17 @@
 #region ================== Namespaces
 
 using System;
-using System.Collections;
 using System.Collections.Generic;
-using System.Globalization;
-using System.Text;
-using System.Windows.Forms;
-using System.IO;
-using System.Reflection;
 using System.Drawing;
-using System.ComponentModel;
 using SlimDX;
 using CodeImp.DoomBuilder.Geometry;
 using SlimDX.Direct3D9;
 using CodeImp.DoomBuilder.Data;
 using CodeImp.DoomBuilder.VisualModes;
 using CodeImp.DoomBuilder.Map;
-
-//mxd
-using CodeImp.DoomBuilder.GZBuilder.MD3;
-using CodeImp.DoomBuilder.GZBuilder.Data;
-using CodeImp.DoomBuilder.GZBuilder.Geometry;
-using CodeImp.DoomBuilder.GZBuilder.Rendering;
+using CodeImp.DoomBuilder.GZBuilder.Data; //mxd
+using CodeImp.DoomBuilder.GZBuilder.Geometry; //mxd
+using CodeImp.DoomBuilder.GZBuilder.Rendering; //mxd
 
 #endregion
 
diff --git a/Source/Core/Rendering/ShaderManager.cs b/Source/Core/Rendering/ShaderManager.cs
index 8cdddef8c64f62900c0bde46c43c3f79b46dea2e..76befc9ce1ae434d08ca9aa6b5d8f4b8a72317e9 100644
--- a/Source/Core/Rendering/ShaderManager.cs
+++ b/Source/Core/Rendering/ShaderManager.cs
@@ -17,20 +17,7 @@
 #region ================== Namespaces
 
 using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Text;
-using System.Windows.Forms;
-using System.IO;
-using System.Reflection;
-using System.Drawing;
-using System.ComponentModel;
-using CodeImp.DoomBuilder.Map;
 using SlimDX.Direct3D9;
-using SlimDX;
-using CodeImp.DoomBuilder.Geometry;
-using System.Drawing.Imaging;
 
 #endregion
 
diff --git a/Source/Core/Rendering/SurfaceBufferSet.cs b/Source/Core/Rendering/SurfaceBufferSet.cs
index 5c228bda7b3fcdeb1f903bf2f95f2ac956eaf569..bdc49bc43a4b8c6e8b6ab836a95a0e1f5e8384cb 100644
--- a/Source/Core/Rendering/SurfaceBufferSet.cs
+++ b/Source/Core/Rendering/SurfaceBufferSet.cs
@@ -16,25 +16,8 @@
 
 #region ================== Namespaces
 
-using System;
-using System.Collections;
 using System.Collections.Generic;
-using System.Globalization;
-using System.Text;
-using System.Windows.Forms;
-using System.IO;
-using System.Reflection;
-using System.Drawing;
-using System.ComponentModel;
-using CodeImp.DoomBuilder.Map;
 using SlimDX.Direct3D9;
-using SlimDX;
-using CodeImp.DoomBuilder.Geometry;
-using System.Drawing.Imaging;
-using CodeImp.DoomBuilder.Data;
-using CodeImp.DoomBuilder.Editing;
-
-using Configuration = CodeImp.DoomBuilder.IO.Configuration;
 
 #endregion
 
diff --git a/Source/Core/Rendering/SurfaceEntry.cs b/Source/Core/Rendering/SurfaceEntry.cs
index 7bf0c8958b478069739a6681bc3212714dd492b2..5c3ccd3e903d7de114d8a0eccf45d6395957cd6b 100644
--- a/Source/Core/Rendering/SurfaceEntry.cs
+++ b/Source/Core/Rendering/SurfaceEntry.cs
@@ -16,25 +16,7 @@
 
 #region ================== Namespaces
 
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Text;
-using System.Windows.Forms;
-using System.IO;
-using System.Reflection;
 using System.Drawing;
-using System.ComponentModel;
-using CodeImp.DoomBuilder.Map;
-using SlimDX.Direct3D9;
-using SlimDX;
-using CodeImp.DoomBuilder.Geometry;
-using System.Drawing.Imaging;
-using CodeImp.DoomBuilder.Data;
-using CodeImp.DoomBuilder.Editing;
-
-using Configuration = CodeImp.DoomBuilder.IO.Configuration;
 
 #endregion
 
diff --git a/Source/Core/Rendering/SurfaceEntryCollection.cs b/Source/Core/Rendering/SurfaceEntryCollection.cs
index 8eafd5810445798d8919cdbcaaa0c151b444cebf..8bedee69fd21d63fe07cbc76871479926fd05b82 100644
--- a/Source/Core/Rendering/SurfaceEntryCollection.cs
+++ b/Source/Core/Rendering/SurfaceEntryCollection.cs
@@ -16,25 +16,7 @@
 
 #region ================== Namespaces
 
-using System;
-using System.Collections;
 using System.Collections.Generic;
-using System.Globalization;
-using System.Text;
-using System.Windows.Forms;
-using System.IO;
-using System.Reflection;
-using System.Drawing;
-using System.ComponentModel;
-using CodeImp.DoomBuilder.Map;
-using SlimDX.Direct3D9;
-using SlimDX;
-using CodeImp.DoomBuilder.Geometry;
-using System.Drawing.Imaging;
-using CodeImp.DoomBuilder.Data;
-using CodeImp.DoomBuilder.Editing;
-
-using Configuration = CodeImp.DoomBuilder.IO.Configuration;
 
 #endregion
 
diff --git a/Source/Core/Rendering/SurfaceManager.cs b/Source/Core/Rendering/SurfaceManager.cs
index 5a4b2a8425b8538f264a1ed509705c98329e772e..6827f4e0eb937c01444ad1e2daf34f4c9bf7f288 100644
--- a/Source/Core/Rendering/SurfaceManager.cs
+++ b/Source/Core/Rendering/SurfaceManager.cs
@@ -17,24 +17,13 @@
 #region ================== Namespaces
 
 using System;
-using System.Collections;
 using System.Collections.Generic;
-using System.Globalization;
-using System.Text;
-using System.Windows.Forms;
 using System.IO;
-using System.Reflection;
 using System.Drawing;
-using System.ComponentModel;
 using CodeImp.DoomBuilder.Map;
 using SlimDX.Direct3D9;
 using SlimDX;
-using CodeImp.DoomBuilder.Geometry;
-using System.Drawing.Imaging;
 using CodeImp.DoomBuilder.Data;
-using CodeImp.DoomBuilder.Editing;
-
-using Configuration = CodeImp.DoomBuilder.IO.Configuration;
 
 #endregion
 
diff --git a/Source/Core/Rendering/SurfaceUpdate.cs b/Source/Core/Rendering/SurfaceUpdate.cs
index 96f8bf58935c298a7b9467e86248df08b0c2d607..75b022781388d4a5927897fd9b665b158d7188a6 100644
--- a/Source/Core/Rendering/SurfaceUpdate.cs
+++ b/Source/Core/Rendering/SurfaceUpdate.cs
@@ -16,26 +16,6 @@
 
 #region ================== Namespaces
 
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Text;
-using System.Windows.Forms;
-using System.IO;
-using System.Reflection;
-using System.Drawing;
-using System.ComponentModel;
-using CodeImp.DoomBuilder.Map;
-using SlimDX.Direct3D9;
-using SlimDX;
-using CodeImp.DoomBuilder.Geometry;
-using System.Drawing.Imaging;
-using CodeImp.DoomBuilder.Data;
-using CodeImp.DoomBuilder.Editing;
-
-using Configuration = CodeImp.DoomBuilder.IO.Configuration;
-
 #endregion
 
 namespace CodeImp.DoomBuilder.Rendering
diff --git a/Source/Core/Rendering/TextAlignment.cs b/Source/Core/Rendering/TextAlignment.cs
index 1a7d438ec211c6716c5be51318b0246559375129..0cffa7265398ce3d190eea6372f184904ee68130 100644
--- a/Source/Core/Rendering/TextAlignment.cs
+++ b/Source/Core/Rendering/TextAlignment.cs
@@ -16,24 +16,6 @@
 
 #region ================== Namespaces
 
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Text;
-using System.Windows.Forms;
-using System.IO;
-using System.Reflection;
-using System.Drawing;
-using System.ComponentModel;
-using CodeImp.DoomBuilder.Map;
-using SlimDX.Direct3D9;
-using SlimDX;
-using CodeImp.DoomBuilder.Geometry;
-using System.Drawing.Imaging;
-using CodeImp.DoomBuilder.Data;
-using CodeImp.DoomBuilder.Editing;
-
 #endregion
 
 namespace CodeImp.DoomBuilder.Rendering
diff --git a/Source/Core/Rendering/TextFont.cs b/Source/Core/Rendering/TextFont.cs
index 750fedcba7e490d96603693cc9907ac0b6f59110..e92924ba09d1221b4dd48500ca4828d7c431811c 100644
--- a/Source/Core/Rendering/TextFont.cs
+++ b/Source/Core/Rendering/TextFont.cs
@@ -18,21 +18,10 @@
 
 using System;
 using System.Collections;
-using System.Collections.Generic;
-using System.Globalization;
 using System.Text;
-using System.Windows.Forms;
 using System.IO;
-using System.Reflection;
 using System.Drawing;
-using System.ComponentModel;
-using CodeImp.DoomBuilder.Map;
-using SlimDX.Direct3D9;
 using SlimDX;
-using CodeImp.DoomBuilder.Geometry;
-using System.Drawing.Imaging;
-using CodeImp.DoomBuilder.Data;
-using CodeImp.DoomBuilder.Editing;
 
 using Configuration = CodeImp.DoomBuilder.IO.Configuration;
 
diff --git a/Source/Core/Rendering/TextLabel.cs b/Source/Core/Rendering/TextLabel.cs
index c4000c59bc85fb98f1d2d2ee8411e99476ef2fff..3e87344ed35faf9279b10b1c2629c40941854f43 100644
--- a/Source/Core/Rendering/TextLabel.cs
+++ b/Source/Core/Rendering/TextLabel.cs
@@ -17,22 +17,11 @@
 #region ================== Namespaces
 
 using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Globalization;
 using System.Text;
-using System.Windows.Forms;
-using System.IO;
-using System.Reflection;
 using System.Drawing;
-using System.ComponentModel;
-using CodeImp.DoomBuilder.Map;
 using SlimDX.Direct3D9;
 using SlimDX;
 using CodeImp.DoomBuilder.Geometry;
-using System.Drawing.Imaging;
-using CodeImp.DoomBuilder.Data;
-using CodeImp.DoomBuilder.Editing;
 
 #endregion
 
diff --git a/Source/Core/Rendering/Things2DShader.cs b/Source/Core/Rendering/Things2DShader.cs
index 5d9ae628b72d2d30057fc0cf0bc1e4d7b0c509b3..a951fb58a14da7cd30e17882b213fec1e1131e49 100644
--- a/Source/Core/Rendering/Things2DShader.cs
+++ b/Source/Core/Rendering/Things2DShader.cs
@@ -17,20 +17,9 @@
 #region ================== Namespaces
 
 using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Text;
-using System.Windows.Forms;
-using System.IO;
-using System.Reflection;
-using System.Drawing;
-using System.ComponentModel;
-using CodeImp.DoomBuilder.Map;
 using SlimDX.Direct3D9;
 using SlimDX;
 using CodeImp.DoomBuilder.Geometry;
-using System.Drawing.Imaging;
 
 #endregion
 
diff --git a/Source/Core/Rendering/ViewMode.cs b/Source/Core/Rendering/ViewMode.cs
index a8400c7474c3dbbeb66db314e10b15a8a4446fd5..0af4cba58bd10baabb9a7e48ebb100793433ba8d 100644
--- a/Source/Core/Rendering/ViewMode.cs
+++ b/Source/Core/Rendering/ViewMode.cs
@@ -16,24 +16,6 @@
 
 #region ================== Namespaces
 
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Text;
-using System.Windows.Forms;
-using System.IO;
-using System.Reflection;
-using System.Drawing;
-using System.ComponentModel;
-using CodeImp.DoomBuilder.Map;
-using SlimDX.Direct3D9;
-using SlimDX;
-using CodeImp.DoomBuilder.Geometry;
-using System.Drawing.Imaging;
-using CodeImp.DoomBuilder.Data;
-using CodeImp.DoomBuilder.Editing;
-
 #endregion
 
 namespace CodeImp.DoomBuilder.Rendering
diff --git a/Source/Core/Rendering/World3DShader.cs b/Source/Core/Rendering/World3DShader.cs
index 2b3aee55728ab7ab9ec75d0e512efdf9ff16c9c7..cff9185c2d93673542b9ea5f3a00941977796910 100644
--- a/Source/Core/Rendering/World3DShader.cs
+++ b/Source/Core/Rendering/World3DShader.cs
@@ -17,20 +17,8 @@
 #region ================== Namespaces
 
 using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Text;
-using System.Windows.Forms;
-using System.IO;
-using System.Reflection;
-using System.Drawing;
-using System.ComponentModel;
-using CodeImp.DoomBuilder.Map;
 using SlimDX.Direct3D9;
 using SlimDX;
-using CodeImp.DoomBuilder.Geometry;
-using System.Drawing.Imaging;
 
 #endregion
 
diff --git a/Source/Core/Rendering/WorldVertex.cs b/Source/Core/Rendering/WorldVertex.cs
index 7a5df45ff19ba8712a5ae735a9bc9745ec79665a..73b0ea3e11dbb049682b70d8f03cbb321138ed89 100644
--- a/Source/Core/Rendering/WorldVertex.cs
+++ b/Source/Core/Rendering/WorldVertex.cs
@@ -16,21 +16,7 @@
 
 #region ================== Namespaces
 
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Text;
-using System.Windows.Forms;
-using System.IO;
-using System.Reflection;
-using System.Drawing;
-using System.ComponentModel;
-using CodeImp.DoomBuilder.Map;
-using SlimDX.Direct3D9;
-using SlimDX;
 using CodeImp.DoomBuilder.Geometry;
-using System.Drawing.Imaging;
 
 #endregion
 
diff --git a/Source/Core/Types/AngleDegreesFloatHandler.cs b/Source/Core/Types/AngleDegreesFloatHandler.cs
index 9c97efe9975c55687bc0e77b5670060c3aa7f13b..89ef7b4adcac92b93687974a9cb3b74869a1e59a 100644
--- a/Source/Core/Types/AngleDegreesFloatHandler.cs
+++ b/Source/Core/Types/AngleDegreesFloatHandler.cs
@@ -17,16 +17,8 @@
 #region ================== Namespaces
 
 using System;
-using System.Collections;
-using System.Collections.Generic;
 using System.Drawing;
 using System.Globalization;
-using System.Text;
-using CodeImp.DoomBuilder.IO;
-using CodeImp.DoomBuilder.Data;
-using System.IO;
-using System.Diagnostics;
-using CodeImp.DoomBuilder.Config;
 using System.Windows.Forms;
 using CodeImp.DoomBuilder.Windows;
 
diff --git a/Source/Core/Types/AngleDegreesHandler.cs b/Source/Core/Types/AngleDegreesHandler.cs
index 4e4af925b2722aced3ebf44fda55deca497bde64..22ff2f630227fb1379444acd1cd790007a505c44 100644
--- a/Source/Core/Types/AngleDegreesHandler.cs
+++ b/Source/Core/Types/AngleDegreesHandler.cs
@@ -17,16 +17,8 @@
 #region ================== Namespaces
 
 using System;
-using System.Collections;
-using System.Collections.Generic;
 using System.Drawing;
 using System.Globalization;
-using System.Text;
-using CodeImp.DoomBuilder.IO;
-using CodeImp.DoomBuilder.Data;
-using System.IO;
-using System.Diagnostics;
-using CodeImp.DoomBuilder.Config;
 using System.Windows.Forms;
 using CodeImp.DoomBuilder.Windows;
 
diff --git a/Source/Core/Types/AngleRadiansHandler.cs b/Source/Core/Types/AngleRadiansHandler.cs
index 9df18a56b25bec646fd912d9e758ae641a5cd1ee..b6247c6d2bf79cccd127fe25cbf8abae7eb8dc8b 100644
--- a/Source/Core/Types/AngleRadiansHandler.cs
+++ b/Source/Core/Types/AngleRadiansHandler.cs
@@ -17,16 +17,8 @@
 #region ================== Namespaces
 
 using System;
-using System.Collections;
-using System.Collections.Generic;
 using System.Drawing;
 using System.Globalization;
-using System.Text;
-using CodeImp.DoomBuilder.IO;
-using CodeImp.DoomBuilder.Data;
-using System.IO;
-using System.Diagnostics;
-using CodeImp.DoomBuilder.Config;
 using System.Windows.Forms;
 using CodeImp.DoomBuilder.Windows;
 using CodeImp.DoomBuilder.Geometry;
diff --git a/Source/Core/Types/BoolHandler.cs b/Source/Core/Types/BoolHandler.cs
index 75982fd392983ac86fa8bc90ef34be25ffcb72fd..e0b1ce599048ee7f1d5835c4acc23fdfcf2f6be3 100644
--- a/Source/Core/Types/BoolHandler.cs
+++ b/Source/Core/Types/BoolHandler.cs
@@ -17,14 +17,6 @@
 #region ================== Namespaces
 
 using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Text;
-using CodeImp.DoomBuilder.IO;
-using CodeImp.DoomBuilder.Data;
-using System.IO;
-using System.Diagnostics;
 using CodeImp.DoomBuilder.Config;
 
 #endregion
diff --git a/Source/Core/Types/ColorHandler.cs b/Source/Core/Types/ColorHandler.cs
index 64318217125086212c53a6f863a5776bbfdfd09c..a6798ccca92de50998da24316751d75512f9afd9 100644
--- a/Source/Core/Types/ColorHandler.cs
+++ b/Source/Core/Types/ColorHandler.cs
@@ -17,16 +17,7 @@
 #region ================== Namespaces
 
 using System;
-using System.Collections;
-using System.Collections.Generic;
 using System.Globalization;
-using System.Text;
-using CodeImp.DoomBuilder.IO;
-using CodeImp.DoomBuilder.Data;
-using System.IO;
-using System.Diagnostics;
-using CodeImp.DoomBuilder.Config;
-using CodeImp.DoomBuilder.Windows;
 using System.Windows.Forms;
 using System.Drawing;
 
diff --git a/Source/Core/Types/EnumBitsHandler.cs b/Source/Core/Types/EnumBitsHandler.cs
index 41f277e38be8f2083f76c19eab795c0d4b64f7e8..4ddfcfb0456ee138c031fa9dd78d366cf4b1aada 100644
--- a/Source/Core/Types/EnumBitsHandler.cs
+++ b/Source/Core/Types/EnumBitsHandler.cs
@@ -17,15 +17,8 @@
 #region ================== Namespaces
 
 using System;
-using System.Collections;
-using System.Collections.Generic;
 using System.Drawing;
 using System.Globalization;
-using System.Text;
-using CodeImp.DoomBuilder.IO;
-using CodeImp.DoomBuilder.Data;
-using System.IO;
-using System.Diagnostics;
 using CodeImp.DoomBuilder.Config;
 using System.Windows.Forms;
 using CodeImp.DoomBuilder.Windows;
diff --git a/Source/Core/Types/EnumOptionHandler.cs b/Source/Core/Types/EnumOptionHandler.cs
index 063df9b67fec7b381d6445fc054761419c7eb4b9..1ac0fab47ed1abf140fd30f0486511b213482883 100644
--- a/Source/Core/Types/EnumOptionHandler.cs
+++ b/Source/Core/Types/EnumOptionHandler.cs
@@ -17,14 +17,7 @@
 #region ================== Namespaces
 
 using System;
-using System.Collections;
-using System.Collections.Generic;
 using System.Globalization;
-using System.Text;
-using CodeImp.DoomBuilder.IO;
-using CodeImp.DoomBuilder.Data;
-using System.IO;
-using System.Diagnostics;
 using CodeImp.DoomBuilder.Config;
 
 #endregion
diff --git a/Source/Core/Types/EnumStringsHandler.cs b/Source/Core/Types/EnumStringsHandler.cs
index fd50691477a63ba2ed9cc386eec7dc2df5ff9fea..6bac9ec57a515a4db7e85b8f9cbf2e9407b277ae 100644
--- a/Source/Core/Types/EnumStringsHandler.cs
+++ b/Source/Core/Types/EnumStringsHandler.cs
@@ -16,15 +16,7 @@
 
 #region ================== Namespaces
 
-using System;
-using System.Collections;
-using System.Collections.Generic;
 using System.Globalization;
-using System.Text;
-using CodeImp.DoomBuilder.IO;
-using CodeImp.DoomBuilder.Data;
-using System.IO;
-using System.Diagnostics;
 using CodeImp.DoomBuilder.Config;
 
 #endregion
diff --git a/Source/Core/Types/FlatHandler.cs b/Source/Core/Types/FlatHandler.cs
index 9f3dd4d9abcf02843d8f7064c3c2fc608a8a2266..a6e8666c8b6832881df1488a7f0a20e040ec5d00 100644
--- a/Source/Core/Types/FlatHandler.cs
+++ b/Source/Core/Types/FlatHandler.cs
@@ -16,16 +16,7 @@
 
 #region ================== Namespaces
 
-using System;
-using System.Collections;
-using System.Collections.Generic;
 using System.Drawing;
-using System.Globalization;
-using System.Text;
-using CodeImp.DoomBuilder.IO;
-using CodeImp.DoomBuilder.Data;
-using System.IO;
-using System.Diagnostics;
 using System.Windows.Forms;
 using CodeImp.DoomBuilder.Windows;
 
diff --git a/Source/Core/Types/FloatHandler.cs b/Source/Core/Types/FloatHandler.cs
index 47c24c5b35a7b3978f856dd18d6e4727f44fbdce..4bc22afd8f6f64f64a2a25d07b2ae00f36d8c8b8 100644
--- a/Source/Core/Types/FloatHandler.cs
+++ b/Source/Core/Types/FloatHandler.cs
@@ -17,14 +17,7 @@
 #region ================== Namespaces
 
 using System;
-using System.Collections;
-using System.Collections.Generic;
 using System.Globalization;
-using System.Text;
-using CodeImp.DoomBuilder.IO;
-using CodeImp.DoomBuilder.Data;
-using System.IO;
-using System.Diagnostics;
 
 #endregion
 
diff --git a/Source/Core/Types/IntegerHandler.cs b/Source/Core/Types/IntegerHandler.cs
index 0d69a0c701fe4c5cb24e76ccdbb22fa3b5a66608..d02b30b1dcbfc57807447827f1822b212bac436a 100644
--- a/Source/Core/Types/IntegerHandler.cs
+++ b/Source/Core/Types/IntegerHandler.cs
@@ -17,14 +17,7 @@
 #region ================== Namespaces
 
 using System;
-using System.Collections;
-using System.Collections.Generic;
 using System.Globalization;
-using System.Text;
-using CodeImp.DoomBuilder.IO;
-using CodeImp.DoomBuilder.Data;
-using System.IO;
-using System.Diagnostics;
 using CodeImp.DoomBuilder.Config;
 
 #endregion
diff --git a/Source/Core/Types/LinedefTagHandler.cs b/Source/Core/Types/LinedefTagHandler.cs
index 7182f1732336466d0f2af382b68580cabe1bcb46..cd5766946018edac61cacbc2a47ceea434323220 100644
--- a/Source/Core/Types/LinedefTagHandler.cs
+++ b/Source/Core/Types/LinedefTagHandler.cs
@@ -16,19 +16,6 @@
 
 #region ================== Namespaces
 
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Text;
-using CodeImp.DoomBuilder.IO;
-using CodeImp.DoomBuilder.Data;
-using System.IO;
-using System.Diagnostics;
-using CodeImp.DoomBuilder.Config;
-using CodeImp.DoomBuilder.Windows;
-using System.Windows.Forms;
-
 #endregion
 
 namespace CodeImp.DoomBuilder.Types
diff --git a/Source/Core/Types/LinedefTypeHandler.cs b/Source/Core/Types/LinedefTypeHandler.cs
index 7499b3833a344fd481e95548edc6abef2b4b01c9..588ff5c0103b34f2a03918ced5d716faf6c7449b 100644
--- a/Source/Core/Types/LinedefTypeHandler.cs
+++ b/Source/Core/Types/LinedefTypeHandler.cs
@@ -17,16 +17,8 @@
 #region ================== Namespaces
 
 using System;
-using System.Collections;
-using System.Collections.Generic;
 using System.Drawing;
 using System.Globalization;
-using System.Text;
-using CodeImp.DoomBuilder.IO;
-using CodeImp.DoomBuilder.Data;
-using System.IO;
-using System.Diagnostics;
-using CodeImp.DoomBuilder.Config;
 using CodeImp.DoomBuilder.Windows;
 using System.Windows.Forms;
 
diff --git a/Source/Core/Types/NullHandler.cs b/Source/Core/Types/NullHandler.cs
index e8cbf9345a6f7a6c0c2b88ac3de8cbecb76339e4..e1f6726c3c04c384a179941d07e017286ed14670 100644
--- a/Source/Core/Types/NullHandler.cs
+++ b/Source/Core/Types/NullHandler.cs
@@ -16,16 +16,6 @@
 
 #region ================== Namespaces
 
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Text;
-using CodeImp.DoomBuilder.IO;
-using CodeImp.DoomBuilder.Data;
-using System.IO;
-using System.Diagnostics;
-
 #endregion
 
 namespace CodeImp.DoomBuilder.Types
diff --git a/Source/Core/Types/SectorEffectHandler.cs b/Source/Core/Types/SectorEffectHandler.cs
index 51bee52c86bc662262d653c072f807f35631262d..4b6d5be5aaecb7cff00dddd1dbf47437468cdb63 100644
--- a/Source/Core/Types/SectorEffectHandler.cs
+++ b/Source/Core/Types/SectorEffectHandler.cs
@@ -17,16 +17,8 @@
 #region ================== Namespaces
 
 using System;
-using System.Collections;
-using System.Collections.Generic;
 using System.Drawing;
 using System.Globalization;
-using System.Text;
-using CodeImp.DoomBuilder.IO;
-using CodeImp.DoomBuilder.Data;
-using System.IO;
-using System.Diagnostics;
-using CodeImp.DoomBuilder.Config;
 using CodeImp.DoomBuilder.Windows;
 using System.Windows.Forms;
 
diff --git a/Source/Core/Types/SectorTagHandler.cs b/Source/Core/Types/SectorTagHandler.cs
index 6bc5bbd1042d2d368c9f56938abf0b1a65191014..4a54d21f5db3a581aafff31bfe685572e051ac4a 100644
--- a/Source/Core/Types/SectorTagHandler.cs
+++ b/Source/Core/Types/SectorTagHandler.cs
@@ -16,19 +16,6 @@
 
 #region ================== Namespaces
 
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Text;
-using CodeImp.DoomBuilder.IO;
-using CodeImp.DoomBuilder.Data;
-using System.IO;
-using System.Diagnostics;
-using CodeImp.DoomBuilder.Config;
-using CodeImp.DoomBuilder.Windows;
-using System.Windows.Forms;
-
 #endregion
 
 namespace CodeImp.DoomBuilder.Types
diff --git a/Source/Core/Types/StringHandler.cs b/Source/Core/Types/StringHandler.cs
index 1703e898396913222a4e1b05a84fc8d77aa8f154..5e51011009a2f91c736d4e5de84681f7d5bb1dee 100644
--- a/Source/Core/Types/StringHandler.cs
+++ b/Source/Core/Types/StringHandler.cs
@@ -16,16 +16,7 @@
 
 #region ================== Namespaces
 
-using System;
-using System.Collections;
-using System.Collections.Generic;
 using System.Drawing;
-using System.Globalization;
-using System.Text;
-using CodeImp.DoomBuilder.IO;
-using CodeImp.DoomBuilder.Data;
-using System.IO;
-using System.Diagnostics;
 using CodeImp.DoomBuilder.Windows;
 using System.Windows.Forms;
 
diff --git a/Source/Core/Types/TextureHandler.cs b/Source/Core/Types/TextureHandler.cs
index 72c586e955f0d48a6c6fe9b98b43f1749f8dc07d..0b7b8054a04d0b63ca5c0214a7fdf104bf88f26c 100644
--- a/Source/Core/Types/TextureHandler.cs
+++ b/Source/Core/Types/TextureHandler.cs
@@ -16,16 +16,7 @@
 
 #region ================== Namespaces
 
-using System;
-using System.Collections;
-using System.Collections.Generic;
 using System.Drawing;
-using System.Globalization;
-using System.Text;
-using CodeImp.DoomBuilder.IO;
-using CodeImp.DoomBuilder.Data;
-using System.IO;
-using System.Diagnostics;
 using System.Windows.Forms;
 using CodeImp.DoomBuilder.Windows;
 
diff --git a/Source/Core/Types/ThingClassHandler.cs b/Source/Core/Types/ThingClassHandler.cs
index 212431c7bac571eb427c610d375bd3e41396be76..99eefc5f485cd09e06ffa5be07ba17c5c2c036b5 100644
--- a/Source/Core/Types/ThingClassHandler.cs
+++ b/Source/Core/Types/ThingClassHandler.cs
@@ -16,17 +16,8 @@
 
 #region ================== Namespaces
 
-using System;
-using System.Collections;
-using System.Collections.Generic;
 using System.Drawing;
-using System.Globalization;
-using System.Text;
 using CodeImp.DoomBuilder.Config;
-using CodeImp.DoomBuilder.IO;
-using CodeImp.DoomBuilder.Data;
-using System.IO;
-using System.Diagnostics;
 using System.Windows.Forms;
 using CodeImp.DoomBuilder.Windows;
 
diff --git a/Source/Core/Types/ThingTagHandler.cs b/Source/Core/Types/ThingTagHandler.cs
index f147ebb58ecfd3f60def84b65e689a391588abdc..5acfb2ee9326f207f2fe334a8207bebdbd312a87 100644
--- a/Source/Core/Types/ThingTagHandler.cs
+++ b/Source/Core/Types/ThingTagHandler.cs
@@ -16,19 +16,6 @@
 
 #region ================== Namespaces
 
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Text;
-using CodeImp.DoomBuilder.IO;
-using CodeImp.DoomBuilder.Data;
-using System.IO;
-using System.Diagnostics;
-using CodeImp.DoomBuilder.Config;
-using CodeImp.DoomBuilder.Windows;
-using System.Windows.Forms;
-
 #endregion
 
 namespace CodeImp.DoomBuilder.Types
diff --git a/Source/Core/Types/ThingTypeHandler.cs b/Source/Core/Types/ThingTypeHandler.cs
index cbf036584f7c4860c69a197cd7260eb95c8e04fb..57f56c0ab87c93c8ae852a73d4f2fcb0a55342c7 100644
--- a/Source/Core/Types/ThingTypeHandler.cs
+++ b/Source/Core/Types/ThingTypeHandler.cs
@@ -17,16 +17,8 @@
 #region ================== Namespaces
 
 using System;
-using System.Collections;
-using System.Collections.Generic;
 using System.Drawing;
 using System.Globalization;
-using System.Text;
-using CodeImp.DoomBuilder.IO;
-using CodeImp.DoomBuilder.Data;
-using System.IO;
-using System.Diagnostics;
-using CodeImp.DoomBuilder.Config;
 using CodeImp.DoomBuilder.Windows;
 using System.Windows.Forms;
 
diff --git a/Source/Core/Types/TypeHandler.cs b/Source/Core/Types/TypeHandler.cs
index 45a62fada65e502ed9662567e09475acc13f93ea..5a1f9e986b800e12ffea95b8544d8f0a4f4817f1 100644
--- a/Source/Core/Types/TypeHandler.cs
+++ b/Source/Core/Types/TypeHandler.cs
@@ -17,15 +17,7 @@
 #region ================== Namespaces
 
 using System;
-using System.Collections;
-using System.Collections.Generic;
 using System.Drawing;
-using System.Globalization;
-using System.Text;
-using CodeImp.DoomBuilder.IO;
-using CodeImp.DoomBuilder.Data;
-using System.IO;
-using System.Diagnostics;
 using System.Windows.Forms;
 using CodeImp.DoomBuilder.Config;
 
diff --git a/Source/Core/Types/TypeHandlerAttribute.cs b/Source/Core/Types/TypeHandlerAttribute.cs
index b0feab73f0af7152ebe8fed36808506ffaab2edf..4bf3d6fece5f97bbb67286455a5f2c298a8f2fde 100644
--- a/Source/Core/Types/TypeHandlerAttribute.cs
+++ b/Source/Core/Types/TypeHandlerAttribute.cs
@@ -17,14 +17,6 @@
 #region ================== Namespaces
 
 using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Text;
-using CodeImp.DoomBuilder.IO;
-using CodeImp.DoomBuilder.Data;
-using System.IO;
-using System.Diagnostics;
 
 #endregion
 
diff --git a/Source/Core/Types/TypesManager.cs b/Source/Core/Types/TypesManager.cs
index 6895188d1f094dc625bc8590e38e6030a399fdb4..26aa90b696587b988037b68a4c87c1db8b5f35db 100644
--- a/Source/Core/Types/TypesManager.cs
+++ b/Source/Core/Types/TypesManager.cs
@@ -17,14 +17,7 @@
 #region ================== Namespaces
 
 using System;
-using System.Collections;
 using System.Collections.Generic;
-using System.Globalization;
-using System.Text;
-using CodeImp.DoomBuilder.IO;
-using CodeImp.DoomBuilder.Data;
-using System.IO;
-using System.Diagnostics;
 using CodeImp.DoomBuilder.Config;
 
 #endregion
diff --git a/Source/Core/Types/UniversalType.cs b/Source/Core/Types/UniversalType.cs
index 536ab52f777c783dacc05ad79204d61d2ef9eb6c..a3006600772f4409079aaa8020dc81f5755e42f5 100644
--- a/Source/Core/Types/UniversalType.cs
+++ b/Source/Core/Types/UniversalType.cs
@@ -16,13 +16,6 @@
 
 #region ================== Namespaces
 
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Text;
-using System.IO;
-
 #endregion
 
 namespace CodeImp.DoomBuilder.Types
diff --git a/Source/Core/VisualModes/IVisualPickable.cs b/Source/Core/VisualModes/IVisualPickable.cs
index a374eedf23149e5d40634cc522f801c624c43ae4..fa1c6f6d819a9d742273c237810dc485bb93dc3b 100644
--- a/Source/Core/VisualModes/IVisualPickable.cs
+++ b/Source/Core/VisualModes/IVisualPickable.cs
@@ -16,25 +16,7 @@
 
 #region ================== Namespaces
 
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Text;
-using System.Windows.Forms;
-using System.IO;
-using System.Reflection;
-using System.Drawing;
-using System.ComponentModel;
-using CodeImp.DoomBuilder.Map;
-using SlimDX.Direct3D9;
-using SlimDX;
 using CodeImp.DoomBuilder.Geometry;
-using System.Drawing.Imaging;
-using CodeImp.DoomBuilder.Data;
-using CodeImp.DoomBuilder.Editing;
-using CodeImp.DoomBuilder.IO;
-using CodeImp.DoomBuilder.Rendering;
 
 #endregion
 
diff --git a/Source/Core/VisualModes/VisualBlockEntry.cs b/Source/Core/VisualModes/VisualBlockEntry.cs
index 80a0136f963b4c54ef38d5168bd901e1453fe79c..ce3bca25cbc7324af01cd840485603bf7ce8437a 100644
--- a/Source/Core/VisualModes/VisualBlockEntry.cs
+++ b/Source/Core/VisualModes/VisualBlockEntry.cs
@@ -16,23 +16,8 @@
 
 #region ================== Namespaces
 
-using System;
-using System.Collections;
 using System.Collections.Generic;
-using System.Globalization;
-using System.Text;
-using System.Windows.Forms;
-using System.IO;
-using System.Reflection;
-using CodeImp.DoomBuilder.Windows;
-using CodeImp.DoomBuilder.IO;
 using CodeImp.DoomBuilder.Map;
-using CodeImp.DoomBuilder.Rendering;
-using CodeImp.DoomBuilder.Actions;
-using CodeImp.DoomBuilder.Geometry;
-using System.Drawing;
-using SlimDX;
-using CodeImp.DoomBuilder.Editing;
 
 #endregion
 
diff --git a/Source/Core/VisualModes/VisualBlockMap.cs b/Source/Core/VisualModes/VisualBlockMap.cs
index 2ae7c393183138e80503171f460efd32a554d660..432ca9069da58552bc43321fb5e37aa3455773d4 100644
--- a/Source/Core/VisualModes/VisualBlockMap.cs
+++ b/Source/Core/VisualModes/VisualBlockMap.cs
@@ -17,22 +17,10 @@
 #region ================== Namespaces
 
 using System;
-using System.Collections;
 using System.Collections.Generic;
-using System.Globalization;
-using System.Text;
-using System.Windows.Forms;
-using System.IO;
-using System.Reflection;
-using CodeImp.DoomBuilder.Windows;
-using CodeImp.DoomBuilder.IO;
 using CodeImp.DoomBuilder.Map;
-using CodeImp.DoomBuilder.Rendering;
-using CodeImp.DoomBuilder.Actions;
 using CodeImp.DoomBuilder.Geometry;
 using System.Drawing;
-using SlimDX;
-using CodeImp.DoomBuilder.Editing;
 
 #endregion
 
diff --git a/Source/Core/VisualModes/VisualCamera.cs b/Source/Core/VisualModes/VisualCamera.cs
index 11e2505760149b8b7ca8715d6b7f64c6e1ca6dc3..93c485f2f4c68130d6594f63a3d7f9262596962d 100644
--- a/Source/Core/VisualModes/VisualCamera.cs
+++ b/Source/Core/VisualModes/VisualCamera.cs
@@ -1,10 +1,5 @@
 #region ================== Namespaces
 
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Text;
 using CodeImp.DoomBuilder.Geometry;
 using CodeImp.DoomBuilder.Map;
 
diff --git a/Source/Core/VisualModes/VisualGeometry.cs b/Source/Core/VisualModes/VisualGeometry.cs
index 74c4b179a5ac7b32c477419968ee330ba66526b8..96baf023942ea5388c9c30b0d1cdd2d436f7fa9c 100644
--- a/Source/Core/VisualModes/VisualGeometry.cs
+++ b/Source/Core/VisualModes/VisualGeometry.cs
@@ -17,27 +17,13 @@
 #region ================== Namespaces
 
 using System;
-using System.Collections;
 using System.Collections.Generic;
-using System.Globalization;
-using System.Text;
-using System.Windows.Forms;
-using System.IO;
-using System.Reflection;
-using System.Drawing;
-using System.ComponentModel;
 using CodeImp.DoomBuilder.Map;
-using SlimDX.Direct3D9;
 using SlimDX;
 using CodeImp.DoomBuilder.Geometry;
-using System.Drawing.Imaging;
 using CodeImp.DoomBuilder.Data;
-using CodeImp.DoomBuilder.Editing;
-using CodeImp.DoomBuilder.IO;
 using CodeImp.DoomBuilder.Rendering;
-
-//mxd
-using CodeImp.DoomBuilder.GZBuilder.Data;
+using CodeImp.DoomBuilder.GZBuilder.Data; //mxd
 
 #endregion
 
diff --git a/Source/Core/VisualModes/VisualMode.cs b/Source/Core/VisualModes/VisualMode.cs
index c420bc16602afe7f259321f53b9656bb5e83ae75..7df490399942bdddc746ade62b67d9a3ccfb3150 100644
--- a/Source/Core/VisualModes/VisualMode.cs
+++ b/Source/Core/VisualModes/VisualMode.cs
@@ -17,21 +17,12 @@
 #region ================== Namespaces
 
 using System;
-using System.Collections;
 using System.Collections.Generic;
-using System.Globalization;
-using System.Text;
-using System.Windows.Forms;
-using System.IO;
-using System.Reflection;
 using CodeImp.DoomBuilder.Windows;
-using CodeImp.DoomBuilder.IO;
 using CodeImp.DoomBuilder.Map;
 using CodeImp.DoomBuilder.Rendering;
 using CodeImp.DoomBuilder.Actions;
 using CodeImp.DoomBuilder.Geometry;
-using System.Drawing;
-using SlimDX;
 using CodeImp.DoomBuilder.Editing;
 
 #endregion
diff --git a/Source/Core/VisualModes/VisualPickResult.cs b/Source/Core/VisualModes/VisualPickResult.cs
index 76bbde6f7533891f16d5284f33fae979ca31e56c..fa4618f9a1cd88bd41f7da55469a25f0fac99242 100644
--- a/Source/Core/VisualModes/VisualPickResult.cs
+++ b/Source/Core/VisualModes/VisualPickResult.cs
@@ -16,23 +16,7 @@
 
 #region ================== Namespaces
 
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Text;
-using System.Windows.Forms;
-using System.IO;
-using System.Reflection;
-using CodeImp.DoomBuilder.Windows;
-using CodeImp.DoomBuilder.IO;
-using CodeImp.DoomBuilder.Map;
-using CodeImp.DoomBuilder.Rendering;
-using CodeImp.DoomBuilder.Actions;
 using CodeImp.DoomBuilder.Geometry;
-using System.Drawing;
-using SlimDX;
-using CodeImp.DoomBuilder.Editing;
 
 #endregion
 
diff --git a/Source/Core/VisualModes/VisualSector.cs b/Source/Core/VisualModes/VisualSector.cs
index 28cdf92468192dc8d9c3f1665271977507217eb5..af4cb360f6e3fb9c6f5572540dd9972eb0e68d76 100644
--- a/Source/Core/VisualModes/VisualSector.cs
+++ b/Source/Core/VisualModes/VisualSector.cs
@@ -16,24 +16,10 @@
 
 #region ================== Namespaces
 
-using System;
-using System.Collections;
 using System.Collections.Generic;
-using System.Globalization;
-using System.Text;
-using System.Windows.Forms;
-using System.IO;
-using System.Reflection;
-using System.Drawing;
-using System.ComponentModel;
 using CodeImp.DoomBuilder.Map;
 using SlimDX.Direct3D9;
 using SlimDX;
-using CodeImp.DoomBuilder.Geometry;
-using System.Drawing.Imaging;
-using CodeImp.DoomBuilder.Data;
-using CodeImp.DoomBuilder.Editing;
-using CodeImp.DoomBuilder.IO;
 using CodeImp.DoomBuilder.Rendering;
 
 #endregion
diff --git a/Source/Core/VisualModes/VisualThing.cs b/Source/Core/VisualModes/VisualThing.cs
index 9348f84ffae47c6e2bdc80b839ba295db2e781a5..fe1a0aada1b54a92ca65814c77a49477829c3f9b 100644
--- a/Source/Core/VisualModes/VisualThing.cs
+++ b/Source/Core/VisualModes/VisualThing.cs
@@ -17,28 +17,14 @@
 #region ================== Namespaces
 
 using System;
-using System.Collections;
 using System.Collections.Generic;
-using System.Globalization;
-using System.Text;
-using System.Windows.Forms;
-using System.IO;
-using System.Reflection;
-using System.Drawing;
-using System.ComponentModel;
 using CodeImp.DoomBuilder.Map;
 using SlimDX.Direct3D9;
 using SlimDX;
 using CodeImp.DoomBuilder.Geometry;
-using System.Drawing.Imaging;
 using CodeImp.DoomBuilder.Data;
-using CodeImp.DoomBuilder.Editing;
-using CodeImp.DoomBuilder.IO;
 using CodeImp.DoomBuilder.Rendering;
-
-//mxd
-using CodeImp.DoomBuilder.GZBuilder.Data;
-using CodeImp.DoomBuilder.GZBuilder.GZDoom;
+using CodeImp.DoomBuilder.GZBuilder.Data; //mxd
 
 #endregion
 
diff --git a/Source/Core/VisualModes/VisualVertex.cs b/Source/Core/VisualModes/VisualVertex.cs
index 5b16cd3f4172eaec39b8391e3b5e728eee45c751..55fdeb12c84ee49225ec179e6fdc1a44665eb15d 100644
--- a/Source/Core/VisualModes/VisualVertex.cs
+++ b/Source/Core/VisualModes/VisualVertex.cs
@@ -1,9 +1,5 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
-using CodeImp.DoomBuilder.Rendering;
 using CodeImp.DoomBuilder.Map;
-using SlimDX.Direct3D9;
 using SlimDX;
 using CodeImp.DoomBuilder.Geometry;
 
diff --git a/Source/Core/Windows/AboutForm.cs b/Source/Core/Windows/AboutForm.cs
index addb771db573be8d8ce2f69bf9fafcc3784197ef..eacdc28132a7e0794cd1210fcb766e94202cd7c6 100644
--- a/Source/Core/Windows/AboutForm.cs
+++ b/Source/Core/Windows/AboutForm.cs
@@ -17,15 +17,7 @@
 #region ================== Namespaces
 
 using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Drawing;
-using System.Text;
 using System.Windows.Forms;
-using Microsoft.Win32;
-using System.Diagnostics;
-using System.Reflection;
-using CodeImp.DoomBuilder.Controls;
 
 #endregion
 
diff --git a/Source/Core/Windows/ActionBrowserForm.cs b/Source/Core/Windows/ActionBrowserForm.cs
index e59b10a5b6a8a698340c94518bed9e7d660a544b..fe3d62e8d2c2d1c8111825720967d32a66d43401 100644
--- a/Source/Core/Windows/ActionBrowserForm.cs
+++ b/Source/Core/Windows/ActionBrowserForm.cs
@@ -18,18 +18,8 @@
 
 using System;
 using System.Collections.Generic;
-using System.ComponentModel;
-using System.Drawing;
-using System.Text;
 using System.Windows.Forms;
-using Microsoft.Win32;
-using System.Diagnostics;
-using CodeImp.DoomBuilder.Actions;
-using CodeImp.DoomBuilder.Data;
 using CodeImp.DoomBuilder.Config;
-using CodeImp.DoomBuilder.Map;
-using CodeImp.DoomBuilder.IO;
-using CodeImp.DoomBuilder.Controls;
 
 #endregion
 
diff --git a/Source/Core/Windows/AngleForm.cs b/Source/Core/Windows/AngleForm.cs
index 153ecad89f3598e55e09389e528766cd7c25e448..9202bf5d17f9b1c8d300b43fbdaeac731fea9111 100644
--- a/Source/Core/Windows/AngleForm.cs
+++ b/Source/Core/Windows/AngleForm.cs
@@ -17,18 +17,7 @@
 #region ================== Namespaces
 
 using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Drawing;
-using System.Text;
 using System.Windows.Forms;
-using CodeImp.DoomBuilder.Map;
-using CodeImp.DoomBuilder.Data;
-using CodeImp.DoomBuilder.IO;
-using System.IO;
-using CodeImp.DoomBuilder.Config;
-using CodeImp.DoomBuilder.Editing;
-using CodeImp.DoomBuilder.Controls;
 
 #endregion
 
diff --git a/Source/Core/Windows/BitFlagsForm.cs b/Source/Core/Windows/BitFlagsForm.cs
index 7032a5605d40a204ce78f5b309abcbf2b59e34b0..db74461f47b88127e85a08ef744033a05fd67c7c 100644
--- a/Source/Core/Windows/BitFlagsForm.cs
+++ b/Source/Core/Windows/BitFlagsForm.cs
@@ -17,18 +17,8 @@
 #region ================== Namespaces
 
 using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Drawing;
-using System.Text;
 using System.Windows.Forms;
-using CodeImp.DoomBuilder.Map;
-using CodeImp.DoomBuilder.Data;
-using CodeImp.DoomBuilder.IO;
-using System.IO;
 using CodeImp.DoomBuilder.Config;
-using CodeImp.DoomBuilder.Editing;
-using CodeImp.DoomBuilder.Controls;
 
 #endregion
 
diff --git a/Source/Core/Windows/ConfigForm.cs b/Source/Core/Windows/ConfigForm.cs
index c537c19db2e8d6efce4cfa63805b30ca6ac088fc..dca69ad8151b655266b5fb48cdf9c413ceebb4bb 100644
--- a/Source/Core/Windows/ConfigForm.cs
+++ b/Source/Core/Windows/ConfigForm.cs
@@ -18,17 +18,10 @@
 
 using System;
 using System.Collections.Generic;
-using System.ComponentModel;
-using System.Drawing;
-using System.Text;
 using System.Windows.Forms;
-using Microsoft.Win32;
-using System.Diagnostics;
-using CodeImp.DoomBuilder.Actions;
 using CodeImp.DoomBuilder.Data;
 using CodeImp.DoomBuilder.Config;
 using System.IO;
-using CodeImp.DoomBuilder.Controls;
 using CodeImp.DoomBuilder.Editing;
 using CodeImp.DoomBuilder.GZBuilder.Data;
 
diff --git a/Source/Core/Windows/CustomFieldsForm.cs b/Source/Core/Windows/CustomFieldsForm.cs
index 82c88534d480621e439946808b6cf4e04ebcf1a4..521e076af0f383b2d10ceb498982a4333d29f9b1 100644
--- a/Source/Core/Windows/CustomFieldsForm.cs
+++ b/Source/Core/Windows/CustomFieldsForm.cs
@@ -18,17 +18,8 @@
 
 using System;
 using System.Collections.Generic;
-using System.ComponentModel;
-using System.Drawing;
-using System.Text;
 using System.Windows.Forms;
-using Microsoft.Win32;
-using System.Diagnostics;
-using CodeImp.DoomBuilder.Actions;
-using CodeImp.DoomBuilder.Data;
 using CodeImp.DoomBuilder.Config;
-using System.IO;
-using CodeImp.DoomBuilder.Controls;
 using CodeImp.DoomBuilder.Map;
 
 #endregion
diff --git a/Source/Core/Windows/DelayedForm.cs b/Source/Core/Windows/DelayedForm.cs
index 5ba167c76c7d90a882835f74a0eae4da9cf2b076..d636d06a52bb56761d8d68418286ef6b893d2d9d 100644
--- a/Source/Core/Windows/DelayedForm.cs
+++ b/Source/Core/Windows/DelayedForm.cs
@@ -17,12 +17,7 @@
 #region ================== Namespaces
 
 using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Drawing;
-using System.Text;
 using System.Windows.Forms;
-using CodeImp.DoomBuilder.Controls;
 
 #endregion
 
diff --git a/Source/Core/Windows/EffectBrowserForm.cs b/Source/Core/Windows/EffectBrowserForm.cs
index 9514315d9f3205dd595913b4b25dab4235f4da10..e8cb78b4655374dab2b45839a98beeb172944e87 100644
--- a/Source/Core/Windows/EffectBrowserForm.cs
+++ b/Source/Core/Windows/EffectBrowserForm.cs
@@ -18,18 +18,8 @@
 
 using System;
 using System.Collections.Generic;
-using System.ComponentModel;
-using System.Drawing;
-using System.Text;
 using System.Windows.Forms;
-using Microsoft.Win32;
-using System.Diagnostics;
-using CodeImp.DoomBuilder.Actions;
-using CodeImp.DoomBuilder.Data;
 using CodeImp.DoomBuilder.Config;
-using CodeImp.DoomBuilder.Map;
-using CodeImp.DoomBuilder.IO;
-using CodeImp.DoomBuilder.Controls;
 
 #endregion
 
diff --git a/Source/Core/Windows/ErrorsForm.cs b/Source/Core/Windows/ErrorsForm.cs
index 62eba0b4524b101389f1dabf69f4caf942198ab8..f1d5747b4cf23d0c09d427e9b21d5b394824fc0c 100644
--- a/Source/Core/Windows/ErrorsForm.cs
+++ b/Source/Core/Windows/ErrorsForm.cs
@@ -18,17 +18,9 @@
 
 using System;
 using System.Collections.Generic;
-using System.ComponentModel;
 using System.Drawing;
 using System.Text;
 using System.Windows.Forms;
-using Microsoft.Win32;
-using System.Diagnostics;
-using CodeImp.DoomBuilder.Actions;
-using CodeImp.DoomBuilder.Data;
-using CodeImp.DoomBuilder.Config;
-using CodeImp.DoomBuilder.Map;
-using CodeImp.DoomBuilder.Controls;
 
 #endregion
 
diff --git a/Source/Core/Windows/FindReplaceOptions.cs b/Source/Core/Windows/FindReplaceOptions.cs
index c345a31c85357dce44e49677cf49226fc651f097..28b2d431b5d04395e6209e05b6b0bc0d31d7a7af 100644
--- a/Source/Core/Windows/FindReplaceOptions.cs
+++ b/Source/Core/Windows/FindReplaceOptions.cs
@@ -16,24 +16,6 @@
 
 #region ================== Namespaces
 
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Text;
-using System.Windows.Forms;
-using System.IO;
-using System.Reflection;
-using System.Drawing;
-using System.ComponentModel;
-using CodeImp.DoomBuilder.Map;
-using SlimDX.Direct3D9;
-using SlimDX;
-using CodeImp.DoomBuilder.Geometry;
-using System.Drawing.Imaging;
-using CodeImp.DoomBuilder.Data;
-using CodeImp.DoomBuilder.Editing;
-
 #endregion
 
 namespace CodeImp.DoomBuilder.Windows
diff --git a/Source/Core/Windows/FlagsForm.cs b/Source/Core/Windows/FlagsForm.cs
index 06af855ae4c55a70a6d87d49cafab539d4d6d6a2..09389f523a6102d27df0c05c9e1e48414b67db12 100644
--- a/Source/Core/Windows/FlagsForm.cs
+++ b/Source/Core/Windows/FlagsForm.cs
@@ -1,12 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
 using System.Windows.Forms;
-using CodeImp.DoomBuilder.Config;
 
 namespace CodeImp.DoomBuilder.Windows
 {
diff --git a/Source/Core/Windows/GridSetupForm.cs b/Source/Core/Windows/GridSetupForm.cs
index 1c44bb4b6f1c0007741134b506f9ee894c0a2d4e..44a7cf76a331cbef0a379c10c2b2cb5e3989a265 100644
--- a/Source/Core/Windows/GridSetupForm.cs
+++ b/Source/Core/Windows/GridSetupForm.cs
@@ -17,18 +17,10 @@
 #region ================== Namespaces
 
 using System;
-using System.Collections.Generic;
-using System.ComponentModel;
 using System.Drawing;
-using System.Text;
 using System.Windows.Forms;
-using CodeImp.DoomBuilder.Map;
 using CodeImp.DoomBuilder.Data;
-using CodeImp.DoomBuilder.IO;
-using System.IO;
-using CodeImp.DoomBuilder.Config;
 using CodeImp.DoomBuilder.Editing;
-using CodeImp.DoomBuilder.Controls;
 
 #endregion
 
diff --git a/Source/Core/Windows/IMainForm.cs b/Source/Core/Windows/IMainForm.cs
index 6c013c33a5bfee7ae9936fa797e529ce09983c34..7f22fc0bfbaddbe085682ccc13f1213e56003c01 100644
--- a/Source/Core/Windows/IMainForm.cs
+++ b/Source/Core/Windows/IMainForm.cs
@@ -17,23 +17,10 @@
 #region ================== Namespaces
 
 using System;
-using System.Collections;
 using System.Collections.Generic;
-using System.Globalization;
-using System.Text;
 using System.Windows.Forms;
-using System.IO;
-using System.Reflection;
-using System.Drawing;
-using System.ComponentModel;
-using CodeImp.DoomBuilder.Actions;
 using CodeImp.DoomBuilder.Map;
-using SlimDX.Direct3D9;
-using SlimDX;
 using CodeImp.DoomBuilder.Geometry;
-using System.Drawing.Imaging;
-using CodeImp.DoomBuilder.Data;
-using CodeImp.DoomBuilder.Editing;
 using CodeImp.DoomBuilder.Controls;
 
 #endregion
diff --git a/Source/Core/Windows/LinedefEditForm.cs b/Source/Core/Windows/LinedefEditForm.cs
index 623a4922f2396adb7b019d9f5a947bc90415f251..4d669cd3716123a30e35a86906d367b58b27c1ab 100644
--- a/Source/Core/Windows/LinedefEditForm.cs
+++ b/Source/Core/Windows/LinedefEditForm.cs
@@ -18,20 +18,12 @@
 
 using System;
 using System.Collections.Generic;
-using System.ComponentModel;
 using System.Drawing;
-using System.Text;
 using System.Windows.Forms;
 using CodeImp.DoomBuilder.Map;
-using CodeImp.DoomBuilder.Data;
-using CodeImp.DoomBuilder.IO;
-using System.IO;
 using CodeImp.DoomBuilder.Config;
-using CodeImp.DoomBuilder.Editing;
-using CodeImp.DoomBuilder.Controls;
-//mxd
-using CodeImp.DoomBuilder.GZBuilder.Data;
-using CodeImp.DoomBuilder.Types;
+using CodeImp.DoomBuilder.GZBuilder.Data; //mxd
+using CodeImp.DoomBuilder.Types; //mxd
 
 #endregion
 
diff --git a/Source/Core/Windows/MainForm.cs b/Source/Core/Windows/MainForm.cs
index 511d46f9264fa955c809f8c33d39835f68340162..fcdd0d9fa1d3558e7f00c6b613c6178e9169844c 100644
--- a/Source/Core/Windows/MainForm.cs
+++ b/Source/Core/Windows/MainForm.cs
@@ -20,14 +20,12 @@ using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Drawing;
-using System.Text;
 using System.Globalization;
 using System.Windows.Forms;
 using CodeImp.DoomBuilder.Actions;
 using CodeImp.DoomBuilder.Geometry;
 using CodeImp.DoomBuilder.Rendering;
 using CodeImp.DoomBuilder.Editing;
-using System.Collections;
 using System.IO;
 using CodeImp.DoomBuilder.Map;
 using System.Reflection;
@@ -37,7 +35,6 @@ using CodeImp.DoomBuilder.IO;
 using CodeImp.DoomBuilder.Properties;
 using CodeImp.DoomBuilder.Config;
 using CodeImp.DoomBuilder.Data;
-using System.Threading;
 using System.Runtime.InteropServices;
 using CodeImp.DoomBuilder.GZBuilder.Windows;
 
diff --git a/Source/Core/Windows/MapOptionsForm.cs b/Source/Core/Windows/MapOptionsForm.cs
index 0fb8aa94f72194cdb7dd066b87282908bc492eb5..82a6d6eeb6290af233ceeb7e33baf0888a437c5e 100644
--- a/Source/Core/Windows/MapOptionsForm.cs
+++ b/Source/Core/Windows/MapOptionsForm.cs
@@ -17,17 +17,12 @@
 #region ================== Namespaces
 
 using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Drawing;
-using System.Text;
 using System.Windows.Forms;
 using CodeImp.DoomBuilder.Map;
 using CodeImp.DoomBuilder.Data;
 using CodeImp.DoomBuilder.IO;
 using System.IO;
 using CodeImp.DoomBuilder.Config;
-using CodeImp.DoomBuilder.Controls;
 
 #endregion
 
diff --git a/Source/Core/Windows/MenuSection.cs b/Source/Core/Windows/MenuSection.cs
index 3dede0f04e25b724ad409f9938dfbb3f4a762a4d..999196b8f2cbbb2b1eef7cc56c8dcb9ebea566bb 100644
--- a/Source/Core/Windows/MenuSection.cs
+++ b/Source/Core/Windows/MenuSection.cs
@@ -16,24 +16,6 @@
 
 #region ================== Namespaces
 
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Text;
-using System.Windows.Forms;
-using System.IO;
-using System.Reflection;
-using System.Drawing;
-using System.ComponentModel;
-using CodeImp.DoomBuilder.Map;
-using SlimDX.Direct3D9;
-using SlimDX;
-using CodeImp.DoomBuilder.Geometry;
-using System.Drawing.Imaging;
-using CodeImp.DoomBuilder.Data;
-using CodeImp.DoomBuilder.Editing;
-
 #endregion
 
 namespace CodeImp.DoomBuilder.Windows
diff --git a/Source/Core/Windows/MessageBeepType.cs b/Source/Core/Windows/MessageBeepType.cs
index 2c49167c16d36ab43220f5c37b2fb3fec1c618f3..897f6e216d398a3cf12c0ac787c769bab1586f7a 100644
--- a/Source/Core/Windows/MessageBeepType.cs
+++ b/Source/Core/Windows/MessageBeepType.cs
@@ -16,24 +16,6 @@
 
 #region ================== Namespaces
 
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Text;
-using System.Windows.Forms;
-using System.IO;
-using System.Reflection;
-using System.Drawing;
-using System.ComponentModel;
-using CodeImp.DoomBuilder.Map;
-using SlimDX.Direct3D9;
-using SlimDX;
-using CodeImp.DoomBuilder.Geometry;
-using System.Drawing.Imaging;
-using CodeImp.DoomBuilder.Data;
-using CodeImp.DoomBuilder.Editing;
-
 #endregion
 
 namespace CodeImp.DoomBuilder.Windows
diff --git a/Source/Core/Windows/OpenMapOptionsForm.cs b/Source/Core/Windows/OpenMapOptionsForm.cs
index e9fc86367ede0b15194c1f4e83e386c77e8f65e1..6c5dd8494c305fa77830d81a01b106a7914bd530 100644
--- a/Source/Core/Windows/OpenMapOptionsForm.cs
+++ b/Source/Core/Windows/OpenMapOptionsForm.cs
@@ -18,18 +18,13 @@
 
 using System;
 using System.Collections.Generic;
-using System.ComponentModel;
-using System.Drawing;
-using System.Text;
 using System.Windows.Forms;
 using CodeImp.DoomBuilder.IO;
 using CodeImp.DoomBuilder.Map;
 using System.IO;
 using System.Collections;
-using System.Diagnostics;
 using CodeImp.DoomBuilder.Data;
 using CodeImp.DoomBuilder.Config;
-using CodeImp.DoomBuilder.Controls;
 
 #endregion
 
diff --git a/Source/Core/Windows/PasteOptionsForm.cs b/Source/Core/Windows/PasteOptionsForm.cs
index 7253f4c19f1d57a0f0a57c27650612db299ef681..424641281663bd46d7d17acf3fddf5eee0b50be5 100644
--- a/Source/Core/Windows/PasteOptionsForm.cs
+++ b/Source/Core/Windows/PasteOptionsForm.cs
@@ -17,19 +17,8 @@
 #region ================== Namespaces
 
 using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Drawing;
-using System.Text;
 using System.Windows.Forms;
-using CodeImp.DoomBuilder.IO;
-using CodeImp.DoomBuilder.Map;
-using System.IO;
-using System.Collections;
-using System.Diagnostics;
-using CodeImp.DoomBuilder.Data;
 using CodeImp.DoomBuilder.Config;
-using CodeImp.DoomBuilder.Controls;
 
 #endregion
 
diff --git a/Source/Core/Windows/PluginToolbarButton.cs b/Source/Core/Windows/PluginToolbarButton.cs
index cea9dba372f03350be61ac574540df0f43ac09e5..a79603c8ecb01cd9792e5dafc355256f45af92bc 100644
--- a/Source/Core/Windows/PluginToolbarButton.cs
+++ b/Source/Core/Windows/PluginToolbarButton.cs
@@ -16,23 +16,7 @@
 
 #region ================== Namespaces
 
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Text;
 using System.Windows.Forms;
-using System.IO;
-using System.Reflection;
-using System.Drawing;
-using System.ComponentModel;
-using CodeImp.DoomBuilder.Map;
-using SlimDX.Direct3D9;
-using SlimDX;
-using CodeImp.DoomBuilder.Geometry;
-using System.Drawing.Imaging;
-using CodeImp.DoomBuilder.Data;
-using CodeImp.DoomBuilder.Editing;
 
 #endregion
 
diff --git a/Source/Core/Windows/PreferencesController.cs b/Source/Core/Windows/PreferencesController.cs
index 31f995dfaed78a9793ae4eb1db9a8458d8aac7fe..af7c1a773f4de10f4b1bd4ed6953e69492b738e2 100644
--- a/Source/Core/Windows/PreferencesController.cs
+++ b/Source/Core/Windows/PreferencesController.cs
@@ -17,22 +17,7 @@
 #region ================== Namespaces
 
 using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Text;
 using System.Windows.Forms;
-using System.IO;
-using System.Reflection;
-using System.Drawing;
-using System.ComponentModel;
-using CodeImp.DoomBuilder.Map;
-using SlimDX.Direct3D9;
-using SlimDX;
-using CodeImp.DoomBuilder.Geometry;
-using System.Drawing.Imaging;
-using CodeImp.DoomBuilder.Data;
-using CodeImp.DoomBuilder.Editing;
 
 #endregion
 
diff --git a/Source/Core/Windows/PreferencesForm.cs b/Source/Core/Windows/PreferencesForm.cs
index 939a41598d25549737e7b34eb73d15a95c17387a..c6005bdfd1d5e0f6e917279fb7a26597842a99b6 100644
--- a/Source/Core/Windows/PreferencesForm.cs
+++ b/Source/Core/Windows/PreferencesForm.cs
@@ -18,17 +18,11 @@
 
 using System;
 using System.Collections.Generic;
-using System.ComponentModel;
 using System.Drawing;
-using System.Text;
 using System.Windows.Forms;
-using Microsoft.Win32;
-using System.Diagnostics;
 using CodeImp.DoomBuilder.Actions;
-using CodeImp.DoomBuilder.Controls;
 using System.Globalization;
 using CodeImp.DoomBuilder.Data;
-using System.IO;
 
 #endregion
 
diff --git a/Source/Core/Windows/ResourceOptionsForm.cs b/Source/Core/Windows/ResourceOptionsForm.cs
index b64662c4b111b386b2e42e0c9804eacd22784e67..53472e3d47457f507ea18510ebd6d4c0d5968288 100644
--- a/Source/Core/Windows/ResourceOptionsForm.cs
+++ b/Source/Core/Windows/ResourceOptionsForm.cs
@@ -17,16 +17,9 @@
 #region ================== Namespaces
 
 using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Drawing;
-using System.Text;
 using System.Windows.Forms;
-using CodeImp.DoomBuilder.Map;
 using System.IO;
 using CodeImp.DoomBuilder.Data;
-using CodeImp.DoomBuilder.Controls;
-using CodeImp.DoomBuilder.IO;
 
 #endregion
 
diff --git a/Source/Core/Windows/ScriptEditorForm.cs b/Source/Core/Windows/ScriptEditorForm.cs
index c05bd98720fba5f4c758e38ba63779a5a15085d4..e8121d474d0bfe957440a0bc1ba2148ca58596f7 100644
--- a/Source/Core/Windows/ScriptEditorForm.cs
+++ b/Source/Core/Windows/ScriptEditorForm.cs
@@ -17,14 +17,8 @@
 #region ================== Namespaces
 
 using System;
-using System.Collections.Generic;
-using System.ComponentModel;
 using System.Drawing;
-using System.Text;
 using System.Windows.Forms;
-using CodeImp.DoomBuilder.Map;
-using System.IO;
-using CodeImp.DoomBuilder.Data;
 using CodeImp.DoomBuilder.Controls;
 
 #endregion
diff --git a/Source/Core/Windows/ScriptFindReplaceForm.cs b/Source/Core/Windows/ScriptFindReplaceForm.cs
index ef950c857bef14d22759870ac181d45a0b846e77..d4b1f75d5e4f29a598823b4dc946de18b7bbb6ca 100644
--- a/Source/Core/Windows/ScriptFindReplaceForm.cs
+++ b/Source/Core/Windows/ScriptFindReplaceForm.cs
@@ -17,15 +17,7 @@
 #region ================== Namespaces
 
 using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Drawing;
-using System.Text;
 using System.Windows.Forms;
-using CodeImp.DoomBuilder.Map;
-using System.IO;
-using CodeImp.DoomBuilder.Data;
-using CodeImp.DoomBuilder.Controls;
 
 #endregion
 
diff --git a/Source/Core/Windows/SectorEditForm.cs b/Source/Core/Windows/SectorEditForm.cs
index 91288d01eef3f9e6c0523190163175944b20e2fb..781dcdbeb37c721a615c4cd051f0572b59ff9969 100644
--- a/Source/Core/Windows/SectorEditForm.cs
+++ b/Source/Core/Windows/SectorEditForm.cs
@@ -18,17 +18,8 @@
 
 using System;
 using System.Collections.Generic;
-using System.ComponentModel;
-using System.Drawing;
-using System.Text;
 using System.Windows.Forms;
 using CodeImp.DoomBuilder.Map;
-using CodeImp.DoomBuilder.Data;
-using CodeImp.DoomBuilder.IO;
-using System.IO;
-using CodeImp.DoomBuilder.Config;
-using CodeImp.DoomBuilder.Editing;
-using CodeImp.DoomBuilder.Controls;
 using CodeImp.DoomBuilder.Types;
 
 #endregion
diff --git a/Source/Core/Windows/SetDefaultTexturesForm.cs b/Source/Core/Windows/SetDefaultTexturesForm.cs
index 7c17a47aece242befdcc6143bf494487db75d9f3..69c6b72148e7e73a03e457351b8e81f3d7b9bc88 100644
--- a/Source/Core/Windows/SetDefaultTexturesForm.cs
+++ b/Source/Core/Windows/SetDefaultTexturesForm.cs
@@ -1,9 +1,5 @@
 using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
 using System.Drawing;
-using System.Text;
 using System.Windows.Forms;
 
 namespace CodeImp.DoomBuilder.Windows
diff --git a/Source/Core/Windows/StatusInfo.cs b/Source/Core/Windows/StatusInfo.cs
index 21830999cf910dbcca4fa6608cf04ab850a96887..0407b13f30c91273c67b66d667d128f2c596f16c 100644
--- a/Source/Core/Windows/StatusInfo.cs
+++ b/Source/Core/Windows/StatusInfo.cs
@@ -16,24 +16,6 @@
 
 #region ================== Namespaces
 
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Text;
-using System.Windows.Forms;
-using System.IO;
-using System.Reflection;
-using System.Drawing;
-using System.ComponentModel;
-using CodeImp.DoomBuilder.Map;
-using SlimDX.Direct3D9;
-using SlimDX;
-using CodeImp.DoomBuilder.Geometry;
-using System.Drawing.Imaging;
-using CodeImp.DoomBuilder.Data;
-using CodeImp.DoomBuilder.Editing;
-
 #endregion
 
 namespace CodeImp.DoomBuilder.Windows
diff --git a/Source/Core/Windows/TanColorTable.cs b/Source/Core/Windows/TanColorTable.cs
index 3a193fc1945182bd5825c7ba0ba7779b23eeac98..f38363bc1d5b7f1c677a6d07aa39dff77b0a13a0 100644
--- a/Source/Core/Windows/TanColorTable.cs
+++ b/Source/Core/Windows/TanColorTable.cs
@@ -17,25 +17,14 @@
 #region ================== Namespaces
 
 using System;
-using System.Collections;
 using System.Collections.Generic;
-using System.Globalization;
 using System.Runtime.InteropServices;
 using System.Text;
 using System.Windows.Forms;
 using System.IO;
-using System.Reflection;
 using System.Drawing;
-using System.ComponentModel;
 using System.Windows.Forms.VisualStyles;
-using CodeImp.DoomBuilder.Map;
 using Microsoft.Win32;
-using SlimDX.Direct3D9;
-using SlimDX;
-using CodeImp.DoomBuilder.Geometry;
-using System.Drawing.Imaging;
-using CodeImp.DoomBuilder.Data;
-using CodeImp.DoomBuilder.Editing;
 
 #endregion
 
diff --git a/Source/Core/Windows/TextEditForm.cs b/Source/Core/Windows/TextEditForm.cs
index 274903d2321b2d7651352c2bac3b0f29b1774ba5..de080ae188e852634738f59539da0c9d2715ddcc 100644
--- a/Source/Core/Windows/TextEditForm.cs
+++ b/Source/Core/Windows/TextEditForm.cs
@@ -17,18 +17,7 @@
 #region ================== Namespaces
 
 using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Drawing;
-using System.Text;
 using System.Windows.Forms;
-using CodeImp.DoomBuilder.Map;
-using CodeImp.DoomBuilder.Data;
-using CodeImp.DoomBuilder.IO;
-using System.IO;
-using CodeImp.DoomBuilder.Config;
-using CodeImp.DoomBuilder.Editing;
-using CodeImp.DoomBuilder.Controls;
 
 #endregion
 
diff --git a/Source/Core/Windows/TextureBrowserForm.cs b/Source/Core/Windows/TextureBrowserForm.cs
index 959c8136cc576fea9d0aaeb34ba78fbc493eb069..63fa0299da570c11439e4a3a3f3bb299e628bd90 100644
--- a/Source/Core/Windows/TextureBrowserForm.cs
+++ b/Source/Core/Windows/TextureBrowserForm.cs
@@ -17,19 +17,11 @@
 #region ================== Namespaces
 
 using System;
-using System.Collections.Generic;
-using System.ComponentModel;
 using System.Drawing;
-using System.Text;
 using System.Windows.Forms;
 using CodeImp.DoomBuilder.IO;
-using Microsoft.Win32;
-using System.Diagnostics;
-using CodeImp.DoomBuilder.Actions;
 using CodeImp.DoomBuilder.Data;
 using CodeImp.DoomBuilder.Config;
-using CodeImp.DoomBuilder.Map;
-using CodeImp.DoomBuilder.Controls;
 using System.IO;
 
 #endregion
diff --git a/Source/Core/Windows/TextureSetForm.cs b/Source/Core/Windows/TextureSetForm.cs
index 7dfe118e52de2b3d3673078b8631e8bed0802bad..cda12004a1391d7e74fd07dea17dcb4210aa31d0 100644
--- a/Source/Core/Windows/TextureSetForm.cs
+++ b/Source/Core/Windows/TextureSetForm.cs
@@ -18,17 +18,9 @@
 
 using System;
 using System.Collections.Generic;
-using System.ComponentModel;
-using System.Drawing;
-using System.Text;
 using System.Windows.Forms;
-using CodeImp.DoomBuilder.Map;
 using CodeImp.DoomBuilder.Data;
-using CodeImp.DoomBuilder.IO;
-using System.IO;
 using CodeImp.DoomBuilder.Config;
-using CodeImp.DoomBuilder.Editing;
-using CodeImp.DoomBuilder.Controls;
 
 #endregion
 
diff --git a/Source/Core/Windows/ThingBrowserForm.cs b/Source/Core/Windows/ThingBrowserForm.cs
index 4658f58f8f80d5758d7a065b62a48ea6b1a85c7b..d9a05a12eb7f63807631379868543de6a64f74c6 100644
--- a/Source/Core/Windows/ThingBrowserForm.cs
+++ b/Source/Core/Windows/ThingBrowserForm.cs
@@ -17,19 +17,7 @@
 #region ================== Namespaces
 
 using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Drawing;
-using System.Text;
 using System.Windows.Forms;
-using Microsoft.Win32;
-using System.Diagnostics;
-using CodeImp.DoomBuilder.Actions;
-using CodeImp.DoomBuilder.Data;
-using CodeImp.DoomBuilder.Config;
-using CodeImp.DoomBuilder.Map;
-using CodeImp.DoomBuilder.IO;
-using CodeImp.DoomBuilder.Controls;
 
 #endregion
 
diff --git a/Source/Core/Windows/ThingEditForm.cs b/Source/Core/Windows/ThingEditForm.cs
index b26b062a64b1b6ce16cad27edfbfd124ae678975..1dfe6ecd77b23daf6fecdcd16b326d208aa8907c 100644
--- a/Source/Core/Windows/ThingEditForm.cs
+++ b/Source/Core/Windows/ThingEditForm.cs
@@ -18,18 +18,12 @@
 
 using System;
 using System.Collections.Generic;
-using System.ComponentModel;
 using System.Drawing;
-using System.Text;
 using System.Windows.Forms;
 using CodeImp.DoomBuilder.Map;
 using CodeImp.DoomBuilder.Data;
-using CodeImp.DoomBuilder.IO;
-using System.IO;
 using CodeImp.DoomBuilder.Config;
-using CodeImp.DoomBuilder.Editing;
 using CodeImp.DoomBuilder.Geometry;
-using CodeImp.DoomBuilder.Controls;
 using CodeImp.DoomBuilder.GZBuilder.Data;
 
 #endregion
diff --git a/Source/Core/Windows/ThingsFiltersForm.cs b/Source/Core/Windows/ThingsFiltersForm.cs
index 8153bcb105c60ccb3d8fe422645d2616fb7de906..1a43af88e7226a004e0d6e9c686ee30d9265ab4b 100644
--- a/Source/Core/Windows/ThingsFiltersForm.cs
+++ b/Source/Core/Windows/ThingsFiltersForm.cs
@@ -20,15 +20,9 @@ using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Drawing;
-using System.Text;
 using System.Windows.Forms;
-using CodeImp.DoomBuilder.Map;
-using CodeImp.DoomBuilder.Data;
-using CodeImp.DoomBuilder.IO;
-using System.IO;
 using CodeImp.DoomBuilder.Config;
 using CodeImp.DoomBuilder.Editing;
-using CodeImp.DoomBuilder.Geometry;
 using CodeImp.DoomBuilder.Controls;
 
 #endregion
diff --git a/Source/Core/Windows/ToolbarSection.cs b/Source/Core/Windows/ToolbarSection.cs
index 13876dd41df485e82b7c32bf3f350821995dc250..f36eb8b0c8727916638be48f1a2e85c36b1899d0 100644
--- a/Source/Core/Windows/ToolbarSection.cs
+++ b/Source/Core/Windows/ToolbarSection.cs
@@ -16,24 +16,6 @@
 
 #region ================== Namespaces
 
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Text;
-using System.Windows.Forms;
-using System.IO;
-using System.Reflection;
-using System.Drawing;
-using System.ComponentModel;
-using CodeImp.DoomBuilder.Map;
-using SlimDX.Direct3D9;
-using SlimDX;
-using CodeImp.DoomBuilder.Geometry;
-using System.Drawing.Imaging;
-using CodeImp.DoomBuilder.Data;
-using CodeImp.DoomBuilder.Editing;
-
 #endregion
 
 namespace CodeImp.DoomBuilder.Windows
diff --git a/Source/Core/Windows/VertexEditForm.cs b/Source/Core/Windows/VertexEditForm.cs
index d6661d6759ddc6e610602364571f9088b97ef561..be4de680e8230315189253f1d95f28db516a15e8 100644
--- a/Source/Core/Windows/VertexEditForm.cs
+++ b/Source/Core/Windows/VertexEditForm.cs
@@ -18,18 +18,9 @@
 
 using System;
 using System.Collections.Generic;
-using System.ComponentModel;
-using System.Drawing;
-using System.Text;
 using System.Windows.Forms;
 using CodeImp.DoomBuilder.Geometry;
 using CodeImp.DoomBuilder.Map;
-using CodeImp.DoomBuilder.Data;
-using CodeImp.DoomBuilder.IO;
-using System.IO;
-using CodeImp.DoomBuilder.Config;
-using CodeImp.DoomBuilder.Editing;
-using CodeImp.DoomBuilder.Controls;
 using CodeImp.DoomBuilder.GZBuilder.Tools;
 
 #endregion
diff --git a/Source/Core/ZDoom/ActorStructure.cs b/Source/Core/ZDoom/ActorStructure.cs
index 87d6d5d1c5b5597d951549d772963aca67b86509..6ac44bb9fb735bead733e259610e04ad569dbd49 100644
--- a/Source/Core/ZDoom/ActorStructure.cs
+++ b/Source/Core/ZDoom/ActorStructure.cs
@@ -16,16 +16,8 @@
 
 #region ================== Namespaces
 
-using System;
-using System.Collections;
 using System.Collections.Generic;
 using System.Globalization;
-using System.Text;
-using CodeImp.DoomBuilder.IO;
-using CodeImp.DoomBuilder.Data;
-using System.IO;
-using System.Diagnostics;
-using CodeImp.DoomBuilder.Compilers;
 
 #endregion
 
diff --git a/Source/Core/ZDoom/DecorateParser.cs b/Source/Core/ZDoom/DecorateParser.cs
index d5de3024767237f42f909460766a1fe984fe4a78..1cb2f6dd3f3794e2b7d6727a75f76177638989c6 100644
--- a/Source/Core/ZDoom/DecorateParser.cs
+++ b/Source/Core/ZDoom/DecorateParser.cs
@@ -16,16 +16,9 @@
 
 #region ================== Namespaces
 
-using System;
 using System.Collections;
 using System.Collections.Generic;
-using System.Globalization;
-using System.Text;
-using CodeImp.DoomBuilder.IO;
-using CodeImp.DoomBuilder.Data;
 using System.IO;
-using System.Diagnostics;
-using CodeImp.DoomBuilder.Compilers;
 
 #endregion
 
diff --git a/Source/Core/ZDoom/PatchStructure.cs b/Source/Core/ZDoom/PatchStructure.cs
index c51cd57d79e65464502e63b62aaa11ce6812af6b..655c447d21842b2c64edecfc43a323b0b022e8d8 100644
--- a/Source/Core/ZDoom/PatchStructure.cs
+++ b/Source/Core/ZDoom/PatchStructure.cs
@@ -17,15 +17,9 @@
 #region ================== Namespaces
 
 using System;
-using System.Collections;
-using System.Collections.Generic;
 using System.Globalization;
-using System.Text;
-using CodeImp.DoomBuilder.IO;
 using CodeImp.DoomBuilder.Data;
 using System.IO;
-using System.Diagnostics;
-using CodeImp.DoomBuilder.Compilers;
 using CodeImp.DoomBuilder.Rendering;
 
 #endregion
diff --git a/Source/Core/ZDoom/StateGoto.cs b/Source/Core/ZDoom/StateGoto.cs
index 5ba53af0f67431865596e12ed9ad4d687774e6ff..4af016879fa01e30066a5cd4f8718dcaef9adb89 100644
--- a/Source/Core/ZDoom/StateGoto.cs
+++ b/Source/Core/ZDoom/StateGoto.cs
@@ -16,17 +16,6 @@
 
 #region ================== Namespaces
 
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Text;
-using CodeImp.DoomBuilder.IO;
-using CodeImp.DoomBuilder.Data;
-using System.IO;
-using System.Diagnostics;
-using CodeImp.DoomBuilder.Compilers;
-
 #endregion
 
 namespace CodeImp.DoomBuilder.ZDoom
diff --git a/Source/Core/ZDoom/StateStructure.cs b/Source/Core/ZDoom/StateStructure.cs
index a8fab9cc1bc27140080486d8135585e23486760e..e6b80c63b1246720747bbe6394140534d687ae26 100644
--- a/Source/Core/ZDoom/StateStructure.cs
+++ b/Source/Core/ZDoom/StateStructure.cs
@@ -16,16 +16,8 @@
 
 #region ================== Namespaces
 
-using System;
-using System.Collections;
 using System.Collections.Generic;
-using System.Globalization;
-using System.Text;
-using CodeImp.DoomBuilder.IO;
-using CodeImp.DoomBuilder.Data;
 using System.IO;
-using System.Diagnostics;
-using CodeImp.DoomBuilder.Compilers;
 
 #endregion
 
diff --git a/Source/Core/ZDoom/TextureStructure.cs b/Source/Core/ZDoom/TextureStructure.cs
index 9217ce2ed99a671d3993c203e0a378a1af908f30..e38f01f6889023d92c9fdb2c8f311f4d9503ceee 100644
--- a/Source/Core/ZDoom/TextureStructure.cs
+++ b/Source/Core/ZDoom/TextureStructure.cs
@@ -16,17 +16,9 @@
 
 #region ================== Namespaces
 
-using System;
-using System.Collections;
 using System.Collections.Generic;
 using System.Globalization;
-using System.Text;
-using CodeImp.DoomBuilder.IO;
 using CodeImp.DoomBuilder.Data;
-using System.IO;
-using System.Diagnostics;
-using CodeImp.DoomBuilder.Compilers;
-using CodeImp.DoomBuilder.Rendering;
 
 #endregion
 
diff --git a/Source/Core/ZDoom/TexturesParser.cs b/Source/Core/ZDoom/TexturesParser.cs
index cc42d913cc8b06fab01c01d560c83b262b4fd41f..8271192699ef9482d077297f5eff2c5665699e43 100644
--- a/Source/Core/ZDoom/TexturesParser.cs
+++ b/Source/Core/ZDoom/TexturesParser.cs
@@ -16,16 +16,8 @@
 
 #region ================== Namespaces
 
-using System;
-using System.Collections;
 using System.Collections.Generic;
-using System.Globalization;
-using System.Text;
-using CodeImp.DoomBuilder.IO;
-using CodeImp.DoomBuilder.Data;
 using System.IO;
-using System.Diagnostics;
-using CodeImp.DoomBuilder.Compilers;
 
 #endregion
 
diff --git a/Source/Core/ZDoom/ZDTextParser.cs b/Source/Core/ZDoom/ZDTextParser.cs
index 8cdddc1d27b2b68f91625ae16c74638580c9bac0..5529b21b3b9f978313beba9ea0c22b6720ce3994 100644
--- a/Source/Core/ZDoom/ZDTextParser.cs
+++ b/Source/Core/ZDoom/ZDTextParser.cs
@@ -16,16 +16,9 @@
 
 #region ================== Namespaces
 
-using System;
-using System.Collections;
-using System.Collections.Generic;
 using System.Globalization;
 using System.Text;
-using CodeImp.DoomBuilder.IO;
-using CodeImp.DoomBuilder.Data;
 using System.IO;
-using System.Diagnostics;
-using CodeImp.DoomBuilder.Compilers;
 
 #endregion