Index: src/Common/DelftTools.Controls.Swf/DelftTools.Controls.Swf.csproj
===================================================================
diff -u -r8f6ae890fed8e8eae3a32f9c0498a10f82e0ddf9 -r96b44c90c3663e87dcb83948bd754e1929c4332b
--- src/Common/DelftTools.Controls.Swf/DelftTools.Controls.Swf.csproj	(.../DelftTools.Controls.Swf.csproj)	(revision 8f6ae890fed8e8eae3a32f9c0498a10f82e0ddf9)
+++ src/Common/DelftTools.Controls.Swf/DelftTools.Controls.Swf.csproj	(.../DelftTools.Controls.Swf.csproj)	(revision 96b44c90c3663e87dcb83948bd754e1929c4332b)
@@ -429,17 +429,10 @@
     <Compile Include="Table\Filtering\IFilterControl.cs" />
     <Compile Include="Table\NonMandatoryDataGridViewComboBoxCell.cs" />
     <Compile Include="Table\SortableAndFilterableBindingList.cs" />
-    <Compile Include="Table\TableView2.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="Table\TableView2.Designer.cs">
-      <DependentUpon>TableView2.cs</DependentUpon>
-    </Compile>
     <Compile Include="Table\EnumFormatter.cs" />
     <Compile Include="Table\TableViewArgumentBasedPasteController.cs" />
     <Compile Include="Table\TableViewCellFormatterProvider.cs" />
     <Compile Include="Table\TableViewCellStyle.cs" />
-    <Compile Include="Table\TableViewColumn2.cs" />
     <Compile Include="Table\TableViewColumnMenuItem.cs" />
     <Compile Include="Table\TableViewComboBoxItem.cs" />
     <Compile Include="Table\TableView.cs">
@@ -577,9 +570,6 @@
       <DependentUpon>TableView.cs</DependentUpon>
       <SubType>Designer</SubType>
     </EmbeddedResource>
-    <EmbeddedResource Include="Table\TableView2.resx">
-      <DependentUpon>TableView2.cs</DependentUpon>
-    </EmbeddedResource>
     <EmbeddedResource Include="Table\TableViewDataToolBar.resx">
       <DependentUpon>TableViewDataToolBar.cs</DependentUpon>
     </EmbeddedResource>
Index: src/Common/DelftTools.Controls.Swf/Table/DataGridViewColumnHelper.cs
===================================================================
diff -u -r8f6ae890fed8e8eae3a32f9c0498a10f82e0ddf9 -r96b44c90c3663e87dcb83948bd754e1929c4332b
--- src/Common/DelftTools.Controls.Swf/Table/DataGridViewColumnHelper.cs	(.../DataGridViewColumnHelper.cs)	(revision 8f6ae890fed8e8eae3a32f9c0498a10f82e0ddf9)
+++ src/Common/DelftTools.Controls.Swf/Table/DataGridViewColumnHelper.cs	(.../DataGridViewColumnHelper.cs)	(revision 96b44c90c3663e87dcb83948bd754e1929c4332b)
@@ -7,18 +7,6 @@
 {
     public static class DataGridViewColumnHelper
     {
-        public static bool ReplaceColumn(TableView2 tableView, DataGridViewColumn oldColum, DataGridViewColumn newColumn)
-        {
-            tableView.ColumnSyncDisabled = true;
-            
-            var index = tableView.DataGridView.Columns.IndexOf(oldColum);
-            tableView.DataGridView.Columns.Remove(oldColum);
-            tableView.DataGridView.Columns.Insert(index, newColumn);
-
-            tableView.ColumnSyncDisabled = false;
-            return true;
-        }
-
         public static DataGridViewColumn CreateGridViewColumn(DataGridViewColumn column, ITypeEditor typeEditor)
         {
             var boxTypeEditor = typeEditor as ComboBoxTypeEditor;
@@ -100,10 +88,7 @@
             
             if (!boxTypeEditor.ItemsMandatory)
             {
-                comboBoxColumn.CellTemplate = new NonMandatoryDataGridViewComboBoxCell
-                                                    {
-                                                        //AllowUserToEnterText = true
-                                                    };
+                comboBoxColumn.CellTemplate = new NonMandatoryDataGridViewComboBoxCell();
             }
             
             comboBoxColumn.DataSource = boxTypeEditor.Items.OfType<object>().ToDictionary(o => GetComboBoxItemText(o, boxTypeEditor), GetComboBoxItemValue).ToList();
Fisheye: Tag 96b44c90c3663e87dcb83948bd754e1929c4332b refers to a dead (removed) revision in file `src/Common/DelftTools.Controls.Swf/Table/TableView2.Designer.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 96b44c90c3663e87dcb83948bd754e1929c4332b refers to a dead (removed) revision in file `src/Common/DelftTools.Controls.Swf/Table/TableView2.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 96b44c90c3663e87dcb83948bd754e1929c4332b refers to a dead (removed) revision in file `src/Common/DelftTools.Controls.Swf/Table/TableView2.resx'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 96b44c90c3663e87dcb83948bd754e1929c4332b refers to a dead (removed) revision in file `src/Common/DelftTools.Controls.Swf/Table/TableViewColumn2.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 96b44c90c3663e87dcb83948bd754e1929c4332b refers to a dead (removed) revision in file `test/Common/DelftTools.Tests/Controls/Swf/Table/TableView2Test.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: test/Common/DelftTools.Tests/DelftTools.Tests.csproj
===================================================================
diff -u -r11a8e23930a4db01f0bfd9ac91d9922922f53e9b -r96b44c90c3663e87dcb83948bd754e1929c4332b
--- test/Common/DelftTools.Tests/DelftTools.Tests.csproj	(.../DelftTools.Tests.csproj)	(revision 11a8e23930a4db01f0bfd9ac91d9922922f53e9b)
+++ test/Common/DelftTools.Tests/DelftTools.Tests.csproj	(.../DelftTools.Tests.csproj)	(revision 96b44c90c3663e87dcb83948bd754e1929c4332b)
@@ -135,7 +135,6 @@
     <Compile Include="Controls\Swf\CustomInputDialogTest.cs" />
     <Compile Include="Controls\Swf\DataEditorGenerator\Domain\BindModel.cs" />
     <Compile Include="Controls\Swf\DataEditorGenerator\SelfCollapsingGroupboxTest.cs" />
-    <Compile Include="Controls\Swf\Table\TableView2Test.cs" />
     <Compile Include="Controls\Swf\FindAndReplaceControlTest.cs" />
     <Compile Include="Controls\Swf\Table\TableViewCsvImportWizardDialogTest.cs" />
     <Compile Include="Controls\Swf\MenuItemContextMenuStripAdapterTest.cs" />