From 8cf9e651cc4b273f24b3a45ce3094580344a4103 Mon Sep 17 00:00:00 2001
From: MaxED <j.maxed@gmail.com>
Date: Thu, 11 Apr 2013 11:04:16 +0000
Subject: [PATCH] Removed a metric ton of unused "using" directives from Core.

---
 Source/Core/Actions/Action.cs                 |  4 ----
 Source/Core/Actions/ActionAttribute.cs        |  4 ----
 Source/Core/Actions/ActionDelegate.cs         |  6 ------
 Source/Core/Actions/ActionManager.cs          |  3 ---
 Source/Core/Actions/BeginActionAttribute.cs   |  7 -------
 Source/Core/Actions/EndActionAttribute.cs     |  7 -------
 Source/Core/Actions/KeyControl.cs             |  9 --------
 Source/Core/Actions/MouseInput.cs             |  8 -------
 Source/Core/Actions/SpecialKeys.cs            |  6 ------
 Source/Core/Compilers/AccCompiler.cs          |  6 ------
 Source/Core/Compilers/Compiler.cs             |  5 +----
 Source/Core/Compilers/CompilerError.cs        |  8 -------
 Source/Core/Compilers/NodesCompiler.cs        |  5 -----
 Source/Core/Config/AllTexturesSet.cs          | 10 ---------
 Source/Core/Config/ArgumentInfo.cs            |  5 -----
 Source/Core/Config/CompilerInfo.cs            |  6 ------
 Source/Core/Config/ConfigurationInfo.cs       |  1 -
 Source/Core/Config/DefinedTextureSet.cs       |  8 -------
 Source/Core/Config/EnumItem.cs                |  9 --------
 Source/Core/Config/EnumList.cs                |  7 -------
 Source/Core/Config/FlagTranslation.cs         |  7 -------
 Source/Core/Config/GameConfiguration.cs       |  5 -----
 Source/Core/Config/GeneralizedBit.cs          |  4 ----
 Source/Core/Config/GeneralizedCategory.cs     |  2 --
 Source/Core/Config/GeneralizedOption.cs       |  7 -------
 Source/Core/Config/IFilledTextureSet.cs       |  9 --------
 Source/Core/Config/INumberedTitle.cs          | 12 -----------
 Source/Core/Config/LinedefActionCategory.cs   |  9 --------
 Source/Core/Config/LinedefActionInfo.cs       |  6 ------
 Source/Core/Config/LinedefActivateInfo.cs     | 10 ---------
 Source/Core/Config/MapLumpInfo.cs             | 11 ----------
 Source/Core/Config/MatchingTextureSet.cs      |  7 -------
 Source/Core/Config/NodebuilderInfo.cs         |  8 -------
 Source/Core/Config/PasteOptions.cs            | 10 ---------
 Source/Core/Config/ProgramConfiguration.cs    |  5 -----
 Source/Core/Config/ResourceTextureSet.cs      | 10 ---------
 Source/Core/Config/ScriptConfiguration.cs     |  8 -------
 Source/Core/Config/SectorEffectInfo.cs        | 10 ---------
 Source/Core/Config/SkillInfo.cs               | 10 ---------
 Source/Core/Config/TagType.cs                 | 11 ----------
 Source/Core/Config/TextureSet.cs              | 10 ---------
 Source/Core/Config/ThingCategory.cs           |  6 ------
 Source/Core/Config/ThingTypeInfo.cs           |  5 -----
 Source/Core/Config/ThingsFlagsCompare.cs      |  9 --------
 Source/Core/Config/UniversalFieldInfo.cs      |  7 -------
 Source/Core/Controls/ActionSelectorControl.cs |  4 ----
 Source/Core/Controls/AngleControl.cs          |  7 -------
 Source/Core/Controls/ArgumentBox.cs           |  4 ----
 Source/Core/Controls/AutoSelectTextbox.cs     |  9 --------
 Source/Core/Controls/ButtonsNumericTextbox.cs |  8 -------
 .../Controls/ButtonsNumericTextboxDesigner.cs | 10 ---------
 Source/Core/Controls/CheckboxArrayControl.cs  |  3 ---
 Source/Core/Controls/ColorControl.cs          |  6 ------
 Source/Core/Controls/Docker.cs                | 15 -------------
 Source/Core/Controls/DockersControl.cs        | 13 ------------
 Source/Core/Controls/DockersTabsControl.cs    | 13 ------------
 Source/Core/Controls/FieldsEditorControl.cs   |  9 --------
 Source/Core/Controls/FieldsEditorRow.cs       | 12 -----------
 Source/Core/Controls/FlatSelectorControl.cs   | 15 -------------
 Source/Core/Controls/ImageBrowserControl.cs   | 10 ---------
 Source/Core/Controls/ImageBrowserItem.cs      | 10 ---------
 Source/Core/Controls/ImageSelectorControl.cs  | 12 -----------
 Source/Core/Controls/LinedefInfoPanel.cs      |  7 -------
 Source/Core/Controls/NumericTextbox.cs        |  8 -------
 Source/Core/Controls/OptimizedListView.cs     | 10 ---------
 Source/Core/Controls/PasteOptionsControl.cs   |  8 -------
 Source/Core/Controls/RenderTargetControl.cs   |  9 --------
 Source/Core/Controls/ResourceListEditor.cs    |  4 ----
 Source/Core/Controls/ResourceListView.cs      |  7 -------
 Source/Core/Controls/ScintillaConstants.cs    |  9 --------
 Source/Core/Controls/ScintillaControl.cs      |  6 ------
 Source/Core/Controls/ScriptDocumentTab.cs     |  7 -------
 Source/Core/Controls/ScriptEditorControl.cs   |  5 -----
 Source/Core/Controls/ScriptEditorPanel.cs     |  9 --------
 Source/Core/Controls/ScriptFileDocumentTab.cs | 13 +-----------
 Source/Core/Controls/ScriptLumpDocumentTab.cs | 16 +-------------
 Source/Core/Controls/SectorInfoPanel.cs       |  7 -------
 .../Core/Controls/TextureSelectorControl.cs   | 15 -------------
 Source/Core/Controls/ThingBrowserControl.cs   | 13 ------------
 Source/Core/Controls/ThingInfoPanel.cs        | 12 +----------
 Source/Core/Controls/TransparentPanel.cs      |  9 --------
 Source/Core/Controls/VertexInfoPanel.cs       |  9 --------
 Source/Core/Data/BitmapImage.cs               |  9 --------
 Source/Core/Data/ColorImage.cs                |  6 ------
 Source/Core/Data/ColormapImage.cs             |  6 ------
 Source/Core/Data/DataLocation.cs              |  4 ----
 Source/Core/Data/DataLocationList.cs          |  2 --
 Source/Core/Data/DataManager.cs               |  8 -------
 Source/Core/Data/DataReader.cs                |  8 -------
 Source/Core/Data/DirectoryReader.cs           |  7 -------
 Source/Core/Data/DynamicBitmapImage.cs        |  9 --------
 Source/Core/Data/FileImage.cs                 |  6 ------
 Source/Core/Data/FlatImage.cs                 |  6 ------
 Source/Core/Data/HighResImage.cs              |  3 ---
 Source/Core/Data/ImageData.cs                 |  5 -----
 Source/Core/Data/ImageDataFormat.cs           |  6 ------
 Source/Core/Data/ImageLoadState.cs            | 13 ------------
 Source/Core/Data/PK3FileImage.cs              |  6 ------
 Source/Core/Data/PK3Reader.cs                 | 13 +++---------
 Source/Core/Data/PK3StructuredReader.cs       |  5 -----
 Source/Core/Data/PatchNames.cs                |  5 -----
 Source/Core/Data/Playpal.cs                   |  5 -----
 Source/Core/Data/PreviewManager.cs            |  5 -----
 Source/Core/Data/ResourceImage.cs             |  7 -------
 Source/Core/Data/SimpleTextureImage.cs        |  7 -------
 Source/Core/Data/SpriteImage.cs               |  7 -------
 Source/Core/Data/TextureImage.cs              |  3 ---
 Source/Core/Data/TexturePatch.cs              |  9 --------
 Source/Core/Data/UnknownImage.cs              |  8 -------
 Source/Core/Data/WADReader.cs                 |  5 -----
 Source/Core/Editing/ClassicMode.cs            |  7 -------
 Source/Core/Editing/CopyPasteManager.cs       | 11 +---------
 Source/Core/Editing/CustomThingsFilter.cs     |  9 --------
 Source/Core/Editing/EditMode.cs               |  9 --------
 Source/Core/Editing/EditModeAttribute.cs      |  5 -----
 Source/Core/Editing/EditModeInfo.cs           |  6 ------
 Source/Core/Editing/EditingManager.cs         | 10 ---------
 Source/Core/Editing/GridSetup.cs              | 10 ---------
 Source/Core/Editing/NullThingsFilter.cs       |  7 -------
 Source/Core/Editing/ThingsFilter.cs           |  4 ----
 Source/Core/Editing/UndoManager.cs            |  6 ------
 Source/Core/Editing/UndoSnapshot.cs           | 13 ------------
 .../Controls/CustomLinedefColorProperties.cs  |  4 ----
 .../Controls/CustomLinedefColorsControl.cs    |  3 ---
 Source/Core/GZBuilder/Controls/IconListBox.cs |  5 +----
 Source/Core/GZBuilder/Controls/TagSelector.cs |  4 ----
 Source/Core/GZBuilder/Data/EngineInfo.cs      |  2 --
 Source/Core/GZBuilder/Data/GZDoomLight.cs     |  3 +--
 Source/Core/GZBuilder/Data/GameType.cs        |  6 +-----
 .../Core/GZBuilder/Data/LinedefColorPreset.cs |  4 +---
 Source/Core/GZBuilder/Data/LinksCollector.cs  |  6 +-----
 Source/Core/GZBuilder/Data/MapInfo.cs         |  4 +---
 Source/Core/GZBuilder/Data/ModelDefEntry.cs   |  6 +-----
 Source/Core/GZBuilder/Data/ScriptItem.cs      |  3 ---
 Source/Core/GZBuilder/Data/ScriptType.cs      |  6 +-----
 .../GZBuilder/Data/SharpCompressHelper.cs     |  3 +--
 Source/Core/GZBuilder/Data/TextureData.cs     |  7 +------
 Source/Core/GZBuilder/Data/ThingCopyData.cs   |  5 +----
 Source/Core/GZBuilder/GZDoom/AcsParserSE.cs   |  5 +----
 .../Core/GZBuilder/GZDoom/DecorateParserSE.cs |  5 +----
 Source/Core/GZBuilder/GZDoom/GldefsParser.cs  |  7 +------
 Source/Core/GZBuilder/GZDoom/MapinfoParser.cs |  5 -----
 .../Core/GZBuilder/GZDoom/ModeldefParser.cs   |  6 +-----
 .../Core/GZBuilder/GZDoom/ModeldefParserSE.cs |  5 +----
 .../GZBuilder/GZDoom/ModeldefStructure.cs     |  5 -----
 .../GZBuilder/GZDoom/ScriptTypeParserSE.cs    |  6 +-----
 Source/Core/GZBuilder/GZGeneral.cs            | 10 ---------
 Source/Core/GZBuilder/Geometry/Line3D.cs      |  2 --
 .../Rendering/SizelessVisualThingCage.cs      |  4 +---
 .../GZBuilder/Rendering/ThingBoundingBox.cs   |  1 -
 .../GZBuilder/Rendering/VisualVertexHandle.cs |  4 +---
 Source/Core/GZBuilder/Tools/UDMFTools.cs      |  3 +--
 .../GZBuilder/Windows/TagStatisticsForm.cs    |  2 --
 Source/Core/GZBuilder/md3/GZModel.cs          |  2 --
 Source/Core/GZBuilder/md3/ModelReader.cs      |  4 ----
 Source/Core/General/BinaryHeap.cs             |  3 ---
 Source/Core/General/CRC.cs                    |  6 ------
 Source/Core/General/Clock.cs                  |  1 -
 Source/Core/General/ErrorItem.cs              |  8 -------
 Source/Core/General/ErrorLogger.cs            |  6 ------
 Source/Core/General/Launcher.cs               |  4 ----
 Source/Core/General/MapManager.cs             | 12 ++---------
 Source/Core/General/SavePurpose.cs            | 21 -------------------
 Source/Core/General/StepsList.cs              |  7 -------
 Source/Core/Geometry/Angle2D.cs               |  4 ----
 Source/Core/Geometry/CurveTools.cs            |  1 -
 Source/Core/Geometry/DrawnVertex.cs           | 15 -------------
 Source/Core/Geometry/EarClipPolygon.cs        |  7 -------
 Source/Core/Geometry/EarClipVertex.cs         |  7 -------
 Source/Core/Geometry/LabelPositionInfo.cs     |  6 ------
 Source/Core/Geometry/Line2D.cs                |  4 ----
 Source/Core/Geometry/LinedefAngleSorter.cs    |  3 ---
 Source/Core/Geometry/LinedefSide.cs           |  9 --------
 Source/Core/Geometry/LinedefsTracePath.cs     |  8 -------
 Source/Core/Geometry/Plane.cs                 |  6 ------
 Source/Core/Geometry/ProjectedFrustum2D.cs    |  5 -----
 Source/Core/Geometry/SidedefAngleSorter.cs    |  3 ---
 Source/Core/Geometry/SidedefsTracePath.cs     |  8 -------
 Source/Core/Geometry/Tools.cs                 |  7 -------
 Source/Core/Geometry/Triangulation.cs         |  6 ------
 Source/Core/Geometry/Vector2D.cs              |  4 ----
 Source/Core/Geometry/Vector3D.cs              |  4 ----
 Source/Core/IO/ClippedStream.cs               |  4 ----
 Source/Core/IO/DeserializerStream.cs          |  7 -------
 Source/Core/IO/DirectoryFileEntry.cs          |  5 -----
 Source/Core/IO/DirectoryFilesList.cs          |  4 ----
 Source/Core/IO/DoomColormapReader.cs          |  6 ------
 Source/Core/IO/DoomFlatReader.cs              |  6 ------
 Source/Core/IO/DoomMapSetIO.cs                |  2 --
 Source/Core/IO/DoomPictureReader.cs           |  6 ------
 Source/Core/IO/FileImageReader.cs             |  7 -------
 Source/Core/IO/HexenMapSetIO.cs               |  2 --
 Source/Core/IO/IImageReader.cs                |  9 --------
 Source/Core/IO/IMapSetIO.cs                   | 10 ---------
 Source/Core/IO/IReadWriteStream.cs            |  9 --------
 Source/Core/IO/Lump.cs                        |  3 ---
 Source/Core/IO/MapSetIO.cs                    |  4 ----
 Source/Core/IO/SerializerStream.cs            |  7 -------
 Source/Core/IO/UniversalCollection.cs         |  6 ------
 Source/Core/IO/UniversalEntry.cs              |  5 -----
 Source/Core/IO/UniversalMapSetIO.cs           |  5 -----
 Source/Core/IO/UniversalParser.cs             |  1 -
 Source/Core/IO/UniversalStreamReader.cs       |  2 --
 Source/Core/IO/UniversalStreamWriter.cs       |  5 -----
 Source/Core/IO/UnknownImageReader.cs          |  7 -------
 Source/Core/IO/WAD.cs                         |  3 ---
 Source/Core/Map/BlockEntry.cs                 | 16 --------------
 Source/Core/Map/BlockMap.cs                   | 13 ------------
 Source/Core/Map/GroupInfo.cs                  |  6 +-----
 Source/Core/Map/Linedef.cs                    |  5 -----
 Source/Core/Map/MapElement.cs                 |  7 -------
 Source/Core/Map/MapElementCollection.cs       |  3 ---
 Source/Core/Map/MapOptions.cs                 |  3 ---
 Source/Core/Map/MapSet.cs                     |  6 ------
 Source/Core/Map/Sector.cs                     |  5 -----
 Source/Core/Map/SelectableElement.cs          | 10 ---------
 Source/Core/Map/SelectionType.cs              |  8 -------
 Source/Core/Map/Sidedef.cs                    |  4 ----
 Source/Core/Map/SidedefPart.cs                |  6 ------
 Source/Core/Map/Thing.cs                      |  6 ------
 Source/Core/Map/UniFields.cs                  |  3 ---
 Source/Core/Map/UniValue.cs                   |  8 -------
 Source/Core/Map/Vertex.cs                     |  6 ------
 Source/Core/Plugins/Plug.cs                   |  6 ------
 Source/Core/Plugins/Plugin.cs                 |  4 ----
 Source/Core/Plugins/PluginManager.cs          |  2 --
 Source/Core/Rendering/ColorCollection.cs      |  6 ------
 Source/Core/Rendering/ColorSetting.cs         |  5 -----
 Source/Core/Rendering/D3DDevice.cs            |  8 -------
 Source/Core/Rendering/D3DShader.cs            | 12 -----------
 Source/Core/Rendering/Display2DShader.cs      | 12 -----------
 Source/Core/Rendering/FlatQuad.cs             |  1 -
 Source/Core/Rendering/FlatVertex.cs           | 16 --------------
 Source/Core/Rendering/ID3DResource.cs         | 14 -------------
 Source/Core/Rendering/IRenderer2D.cs          | 12 -----------
 Source/Core/Rendering/IRenderer3D.cs          | 15 -------------
 Source/Core/Rendering/PixelColor.cs           |  7 -------
 Source/Core/Rendering/PixelColorBlock.cs      |  7 -------
 Source/Core/Rendering/Plotter.cs              | 14 -------------
 Source/Core/Rendering/Presentation.cs         |  4 ----
 Source/Core/Rendering/RenderLayers.cs         |  6 ------
 Source/Core/Rendering/RenderPasses.cs         | 17 ---------------
 Source/Core/Rendering/Renderer.cs             |  5 -----
 Source/Core/Rendering/Renderer2D.cs           | 15 ++-----------
 Source/Core/Rendering/Renderer3D.cs           | 16 +++-----------
 Source/Core/Rendering/ShaderManager.cs        | 13 ------------
 Source/Core/Rendering/SurfaceBufferSet.cs     | 17 ---------------
 Source/Core/Rendering/SurfaceEntry.cs         | 18 ----------------
 .../Core/Rendering/SurfaceEntryCollection.cs  | 18 ----------------
 Source/Core/Rendering/SurfaceManager.cs       | 11 ----------
 Source/Core/Rendering/SurfaceUpdate.cs        | 20 ------------------
 Source/Core/Rendering/TextAlignment.cs        | 18 ----------------
 Source/Core/Rendering/TextFont.cs             | 11 ----------
 Source/Core/Rendering/TextLabel.cs            | 11 ----------
 Source/Core/Rendering/Things2DShader.cs       | 11 ----------
 Source/Core/Rendering/ViewMode.cs             | 18 ----------------
 Source/Core/Rendering/World3DShader.cs        | 12 -----------
 Source/Core/Rendering/WorldVertex.cs          | 14 -------------
 Source/Core/Types/AngleDegreesFloatHandler.cs |  8 -------
 Source/Core/Types/AngleDegreesHandler.cs      |  8 -------
 Source/Core/Types/AngleRadiansHandler.cs      |  8 -------
 Source/Core/Types/BoolHandler.cs              |  8 -------
 Source/Core/Types/ColorHandler.cs             |  9 --------
 Source/Core/Types/EnumBitsHandler.cs          |  7 -------
 Source/Core/Types/EnumOptionHandler.cs        |  7 -------
 Source/Core/Types/EnumStringsHandler.cs       |  8 -------
 Source/Core/Types/FlatHandler.cs              |  9 --------
 Source/Core/Types/FloatHandler.cs             |  7 -------
 Source/Core/Types/IntegerHandler.cs           |  7 -------
 Source/Core/Types/LinedefTagHandler.cs        | 13 ------------
 Source/Core/Types/LinedefTypeHandler.cs       |  8 -------
 Source/Core/Types/NullHandler.cs              | 10 ---------
 Source/Core/Types/SectorEffectHandler.cs      |  8 -------
 Source/Core/Types/SectorTagHandler.cs         | 13 ------------
 Source/Core/Types/StringHandler.cs            |  9 --------
 Source/Core/Types/TextureHandler.cs           |  9 --------
 Source/Core/Types/ThingClassHandler.cs        |  9 --------
 Source/Core/Types/ThingTagHandler.cs          | 13 ------------
 Source/Core/Types/ThingTypeHandler.cs         |  8 -------
 Source/Core/Types/TypeHandler.cs              |  8 -------
 Source/Core/Types/TypeHandlerAttribute.cs     |  8 -------
 Source/Core/Types/TypesManager.cs             |  7 -------
 Source/Core/Types/UniversalType.cs            |  7 -------
 Source/Core/VisualModes/IVisualPickable.cs    | 18 ----------------
 Source/Core/VisualModes/VisualBlockEntry.cs   | 15 -------------
 Source/Core/VisualModes/VisualBlockMap.cs     | 12 -----------
 Source/Core/VisualModes/VisualCamera.cs       |  5 -----
 Source/Core/VisualModes/VisualGeometry.cs     | 16 +-------------
 Source/Core/VisualModes/VisualMode.cs         |  9 --------
 Source/Core/VisualModes/VisualPickResult.cs   | 16 --------------
 Source/Core/VisualModes/VisualSector.cs       | 14 -------------
 Source/Core/VisualModes/VisualThing.cs        | 16 +-------------
 Source/Core/VisualModes/VisualVertex.cs       |  4 ----
 Source/Core/Windows/AboutForm.cs              |  8 -------
 Source/Core/Windows/ActionBrowserForm.cs      | 10 ---------
 Source/Core/Windows/AngleForm.cs              | 11 ----------
 Source/Core/Windows/BitFlagsForm.cs           | 10 ---------
 Source/Core/Windows/ConfigForm.cs             |  7 -------
 Source/Core/Windows/CustomFieldsForm.cs       |  9 --------
 Source/Core/Windows/DelayedForm.cs            |  5 -----
 Source/Core/Windows/EffectBrowserForm.cs      | 10 ---------
 Source/Core/Windows/ErrorsForm.cs             |  8 -------
 Source/Core/Windows/FindReplaceOptions.cs     | 18 ----------------
 Source/Core/Windows/FlagsForm.cs              |  6 ------
 Source/Core/Windows/GridSetupForm.cs          |  8 -------
 Source/Core/Windows/IMainForm.cs              | 13 ------------
 Source/Core/Windows/LinedefEditForm.cs        | 12 ++---------
 Source/Core/Windows/MainForm.cs               |  3 ---
 Source/Core/Windows/MapOptionsForm.cs         |  5 -----
 Source/Core/Windows/MenuSection.cs            | 18 ----------------
 Source/Core/Windows/MessageBeepType.cs        | 18 ----------------
 Source/Core/Windows/OpenMapOptionsForm.cs     |  5 -----
 Source/Core/Windows/PasteOptionsForm.cs       | 11 ----------
 Source/Core/Windows/PluginToolbarButton.cs    | 16 --------------
 Source/Core/Windows/PreferencesController.cs  | 15 -------------
 Source/Core/Windows/PreferencesForm.cs        |  6 ------
 Source/Core/Windows/ResourceOptionsForm.cs    |  7 -------
 Source/Core/Windows/ScriptEditorForm.cs       |  6 ------
 Source/Core/Windows/ScriptFindReplaceForm.cs  |  8 -------
 Source/Core/Windows/SectorEditForm.cs         |  9 --------
 Source/Core/Windows/SetDefaultTexturesForm.cs |  4 ----
 Source/Core/Windows/StatusInfo.cs             | 18 ----------------
 Source/Core/Windows/TanColorTable.cs          | 11 ----------
 Source/Core/Windows/TextEditForm.cs           | 11 ----------
 Source/Core/Windows/TextureBrowserForm.cs     |  8 -------
 Source/Core/Windows/TextureSetForm.cs         |  8 -------
 Source/Core/Windows/ThingBrowserForm.cs       | 12 -----------
 Source/Core/Windows/ThingEditForm.cs          |  6 ------
 Source/Core/Windows/ThingsFiltersForm.cs      |  6 ------
 Source/Core/Windows/ToolbarSection.cs         | 18 ----------------
 Source/Core/Windows/VertexEditForm.cs         |  9 --------
 Source/Core/ZDoom/ActorStructure.cs           |  8 -------
 Source/Core/ZDoom/DecorateParser.cs           |  7 -------
 Source/Core/ZDoom/PatchStructure.cs           |  6 ------
 Source/Core/ZDoom/StateGoto.cs                | 11 ----------
 Source/Core/ZDoom/StateStructure.cs           |  8 -------
 Source/Core/ZDoom/TextureStructure.cs         |  8 -------
 Source/Core/ZDoom/TexturesParser.cs           |  8 -------
 Source/Core/ZDoom/ZDTextParser.cs             |  7 -------
 339 files changed, 40 insertions(+), 2640 deletions(-)

diff --git a/Source/Core/Actions/Action.cs b/Source/Core/Actions/Action.cs
index 485fc643d..267db9580 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 1f76ac4b1..7a456b7d8 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 3686d5b83..1a2bcfad7 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 678d66d25..e004c9cf2 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 a330ab74e..ef19c9018 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 5fe0c726a..8f69faded 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 c9e17f110..05b3c26a9 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 86e34303e..cd2629871 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 4ed78c871..b9dd201df 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 c25156b01..34e87c4b9 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 182c25480..84de9d611 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 956317d94..2aba2da60 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 e19d30fea..1ed218005 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 af732b54d..1bcb2566c 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 58fec3dc5..8767fe29f 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 18368cc90..6a4e20f6b 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 e5e0a6b5c..4789c19db 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 44065a6b1..fbf7c4568 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 d5e925788..e354c7323 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 435928a4e..6f96779b7 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 86cd1647b..60146b9de 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 fa56da703..279e7567f 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 8def54d8f..6eac008a4 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 ac022e8df..b457b3c7d 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 4940b6f47..99b716505 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 9717ef4f9..bf9453f44 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 d2bbd7b7c..9ad37fcb3 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 8768e5aa3..f263d90ea 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 aaaf7da0a..85ac463da 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 e59a76a45..32c3f251d 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 8ca4a2396..bef4a60e7 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 72bf0be31..e6e09e12c 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 e1bbdb51f..ce1b7fc49 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 4cdb91b59..b666cf021 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 0b0d589f8..617231581 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 338bf70ed..ca3538402 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 084168d3d..b97020dc3 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 29d7822f8..96da92bf2 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 806c6cfb7..bc0e5672b 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 38ef313d8..a029b8a22 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 d6d60abf6..5c5acd848 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 082bd9e2c..b7e111bc6 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 b25913349..e4e76bc8d 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 15870c4b3..1c6bce4d4 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 c531054c7..da9616239 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 5a5d17cb5..e941858d8 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 999b1af30..960711750 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 128d233e7..f5e591baa 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 f0507db95..b18e3d77d 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 a2111aa88..6a57e1a34 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 efb2d2e6a..f59e4b4bb 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 933535c80..0077331db 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 1d4c155fb..8fa19e473 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 79cce080b..52e5178d0 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 f81ab15ab..eefae1ff2 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 e4330bd89..76f5eade9 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 59c4acd7d..bae70e2f7 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 db029a9a7..49be3feac 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 78b7be984..5381e7e9b 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 246c34d38..5fa89484c 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 86ba10534..360671d1e 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 f4df43585..7d3ddb713 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 42bf4d301..4e1ac7ca6 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 610dfb2d6..7b53f812d 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 a1aea48a0..057d7f820 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 5a84437ab..d82666b2d 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 be50738e7..01cd0ccd0 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 9916523b4..be1ad5843 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 892cde9b1..f5797d089 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 025dd7900..fbefc4b63 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 644d205ac..4f8f040b9 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 6fa4f4150..912ec28ce 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 dd099b3bb..6b8143252 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 fb53f37d6..22a2fa3d1 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 467212509..8e38f7df1 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 34f412f67..247494c14 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 e0e4cc817..5aa80366d 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 100a66571..8c191b8e7 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 7f13993ca..77a03136d 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 51400a551..9ee19b4d2 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 1543f02e7..fdd20a110 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 7cac98028..3783b345e 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 da669349b..1fa4e88c4 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 366c1787c..67f09416c 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 f10bd6314..f7fc03930 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 7f2128b59..500796e83 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 042b522da..c8ea6a6ac 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 f2fc99c32..8a8b61015 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 a46788e25..6b8ba3d4a 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 22782b784..6e748078a 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 a0ffc0a6f..65fc5d966 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 6c46b665f..a6105dac3 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 a4fee5e63..5a6da909b 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 96cc1f2a0..478fac6b9 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 4bffb09cd..56f5693fa 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 d27675b56..40adbf175 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 7c4a1653e..b2a04a265 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 a597945f7..a4d75248a 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 e8b11c2c6..b71339b3b 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 4ddfadf69..a7451c1a9 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 a90b3cffa..a76399578 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 6c2ead47a..d90cc0fbe 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 49f3b9b2a..143ccd487 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 47d36d60b..b70917e28 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 8555e1dca..e5e3e04f1 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 099b04a36..d7db629ee 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 fbf741942..7d3a4d317 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 4f3ddcc42..79229b995 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 e73c1177f..bfefbd816 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 ad0cc1a41..e817c0213 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 955a110a9..d532ac29d 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 64913c7fa..b4750169e 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 f58482561..c3eb273ec 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 9d39bae10..431649a3c 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 551af29e4..fc4f8c500 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 8681283a5..ab66e3baa 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 d980ad9e1..2c924f360 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 ce6af3113..f35d0170e 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 3a9f7972a..5b93e151e 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 5f5873eb0..6c90f76ba 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 56475e75c..e018557e4 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 7b2f40df1..a32707583 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 8e27c9b74..120b7d189 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 7c1dafddd..90bcc5fdb 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 d3020982c..7252c9fc1 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 0216814be..5a3bae0ba 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 868ab8dd2..84b6d904f 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 2310905dd..ccdf79627 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 ed5e4e371..c0572f68a 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 b973ed1b1..1e2a32e0c 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 9351c2ed8..0c68c8308 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 2109fe461..609280720 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 147a73d5a..8fdd81448 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 84596bc2b..9960bc2c3 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 2a6b6b2d4..067ee0b00 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 809bef8f5..66fa93706 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 209b0f5ec..ed14da536 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 f84b7d223..a6af058ae 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 d16fc8b44..c80ae155f 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 d1dcc2064..c52ff2ca2 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 a16656a70..8d42a4062 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 4dcd64652..b539473d1 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 6392ae9a8..abd8a42ab 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 a4caf66f2..5030d0653 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 445f1619b..e56f2dcb0 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 fd708b1ec..2ea8ba601 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 8b41be3f8..488cf24ad 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 3fd6f8576..816a56d7f 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 34ad25245..3fd6eed78 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 07e0d6499..8259d217b 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 52013f164..d44855ca4 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 77fc10c0c..9a3fb72c7 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 f0ffa432f..bfbfa47af 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 e1068c207..668695660 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 600090f5a..56d5584f3 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 a7a90a926..5908503c7 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 bdbbc036a..150c5bc74 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 ff1651f9f..8d8785ac2 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 ac052d145..61d717f28 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 71826e35d..8a083a394 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 01aee1013..3367abafa 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 d63c5b40a..35b79366e 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 e9c81f049..b82fdee9f 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 cfd1e5d06..9c32e4463 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 91414356f..a098abaf0 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 f03162523..9597b7496 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 d83275900..4196d6e40 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 23de81448..0e7e3171c 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 77c5f5b15..12ec668cb 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 186af49ea..1f06e2641 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 47073ea6d..cc787775c 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 9496d5da3..171e2430a 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 742831752..04de4d61b 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 67cc104e2..6cbd5c94a 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 8b0f430de..d982bfac3 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 3b3662d90..a07c3f545 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 1c719f560..0c404759e 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 c05f6d1a5..846faef4b 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 dca058995..36c023e62 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 6b7b3be39..10428347e 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 519bc229d..20ca5c8ca 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 f200d4a28..2c8cbb4d1 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 aacd9ec32..ef6e14359 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 6fd35f13c..ade11dcf4 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 75250ad54..65febeb8a 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 108049a88..d440df4df 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 0e8444f85..9407c0f6a 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 baae683cf..ac9ebc914 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 0c96f4090..35e4199a6 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 6b24ebd91..18cb4b32d 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 ea42ee09b..7b581519e 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 77f4f4c3b..dc010a66e 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 8f432434f..120c47077 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 0e4e307eb..43bde0d0d 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 61f75ab83..de63c3cec 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 88c218770..68e9cf776 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 92ffb524b..d02b8faac 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 55e59ddc1..c8c8e5c5e 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 ec4aa1a41..231c5bbf6 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 8e925db16..fcda8de68 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 4f2244209..750894dfd 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 feaa205b7..3cc9bf7bf 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 7e03d0e4c..f4f292a85 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 a40060f23..06933f862 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 7e82e3409..1860e063b 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 6af02a270..c6dd02b49 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 8defcfd36..06ade5d46 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 9fdcfc82c..0eedda015 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 61ad6f67e..4f7a4496d 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 b07602bbd..2e0b22a9c 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 810d2142f..e722d5ca3 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 15a821634..925eede49 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 0b59c8b3b..aa3b3c9e1 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 ceb6c9eb0..cc7bf4e5c 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 791a0e06a..fa2caf06f 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 6a84b5194..67707ee68 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 2810245e8..d0562a50a 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 94e6772ec..203bdc00e 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 265605c85..2535979e8 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 752177137..53dc67a0e 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 b7aaab6d6..0cf9d2149 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 eeb9b147b..ea2fb9887 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 d513f7f9d..dacbd4703 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 594a9957e..d258b504c 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 14d002914..e89f2f8ce 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 442951f52..aa877f452 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 e79571b94..7e146c1e0 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 02ba90b78..6eb67d7c0 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 82e8ffc0b..37c21deb7 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 f9f124bd9..abda03d8a 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 9e07c0451..68a65c28f 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 f64964947..9faf759f6 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 49b3ea1e2..4e645233c 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 aad897026..ac2e792cd 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 5772cc78b..556f2f725 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 ece9b45ff..0340c4b17 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 b0370d231..45c93639d 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 a5e44dc48..965b80b21 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 8101341f4..7b383be5a 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 ff2fa6a02..2a4457863 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 20e5fb594..247419cb7 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 a44fbffa5..3c33ccd18 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 03d442c86..f0ab5b0b4 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 425e949c2..5a8c5d4e7 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 9ab453566..a614793b9 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 8cdddef8c..76befc9ce 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 5c228bda7..bdc49bc43 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 7bf0c8958..5c3ccd3e9 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 8eafd5810..8bedee69f 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 5a4b2a842..6827f4e0e 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 96f8bf589..75b022781 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 1a7d438ec..0cffa7265 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 750fedcba..e92924ba0 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 c4000c59b..3e87344ed 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 5d9ae628b..a951fb58a 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 a8400c747..0af4cba58 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 2b3aee557..cff9185c2 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 7a5df45ff..73b0ea3e1 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 9c97efe99..89ef7b4ad 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 4e4af925b..22ff2f630 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 9df18a56b..b6247c6d2 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 75982fd39..e0b1ce599 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 643182171..a6798ccca 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 41f277e38..4ddfcfb04 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 063df9b67..1ac0fab47 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 fd5069147..6bac9ec57 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 9f3dd4d9a..a6e8666c8 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 47c24c5b3..4bc22afd8 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 0d69a0c70..d02b30b1d 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 7182f1732..cd5766946 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 7499b3833..588ff5c01 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 e8cbf9345..e1f6726c3 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 51bee52c8..4b6d5be5a 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 6bc5bbd10..4a54d21f5 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 1703e8983..5e5101100 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 72c586e95..0b7b8054a 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 212431c7b..99eefc5f4 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 f147ebb58..5acfb2ee9 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 cbf036584..57f56c0ab 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 45a62fada..5a1f9e986 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 b0feab73f..4bf3d6fec 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 6895188d1..26aa90b69 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 536ab52f7..a30066007 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 a374eedf2..fa1c6f6d8 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 80a0136f9..ce3bca25c 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 2ae7c3931..432ca9069 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 11e250576..93c485f2f 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 74c4b179a..96baf0239 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 c420bc166..7df490399 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 76bbde6f7..fa4618f9a 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 28cdf9246..af4cb360f 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 9348f84ff..fe1a0aada 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 5b16cd3f4..55fdeb12c 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 addb771db..eacdc2813 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 e59b10a5b..fe3d62e8d 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 153ecad89..9202bf5d1 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 7032a5605..db74461f4 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 c537c19db..dca69ad81 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 82c88534d..521e076af 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 5ba167c76..d636d06a5 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 9514315d9..e8cb78b46 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 62eba0b45..f1d5747b4 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 c345a31c8..28b2d431b 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 06af855ae..09389f523 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 1c44bb4b6..44a7cf76a 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 6c013c33a..7f22fc0bf 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 623a4922f..4d669cd37 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 511d46f92..fcdd0d9fa 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 0fb8aa94f..82a6d6eeb 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 3dede0f04..999196b8f 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 2c49167c1..897f6e216 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 e9fc86367..6c5dd8494 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 7253f4c19..424641281 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 cea9dba37..a79603c8e 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 31f995dfa..af7c1a773 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 939a41598..c6005bdfd 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 b64662c4b..53472e3d4 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 c05bd9872..e8121d474 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 ef950c857..d4b1f75d5 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 91288d01e..781dcdbeb 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 7c17a47ae..69c6b7214 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 21830999c..0407b13f3 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 3a193fc19..f38363bc1 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 274903d23..de080ae18 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 959c8136c..63fa0299d 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 7dfe118e5..cda12004a 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 4658f58f8..d9a05a12e 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 b26b062a6..1dfe6ecd7 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 8153bcb10..1a43af88e 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 13876dd41..f36eb8b0c 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 d6661d675..be4de680e 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 87d6d5d1c..6ac44bb9f 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 d5de30247..1cb2f6dd3 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 c51cd57d7..655c447d2 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 5ba53af0f..4af016879 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 a8fab9cc1..e6b80c63b 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 9217ce2ed..e38f01f68 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 cc42d913c..827119269 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 8cdddc1d2..5529b21b3 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
 
-- 
GitLab