--- MainWindow.cs.old	2009-07-02 13:58:49.000000000 -0400
+++ MainWindow.cs	2009-07-02 14:03:50.000000000 -0400
@@ -56,8 +56,6 @@
             trayIcon.Text = Application.ProductName;
             trayIcon.Visible = m_settings.SystemTrayOptionsIsAlways;
             StaticSkill.LoadStaticSkills();
-            G15Handler.Init();
-
             // Is this the first run with the Accounts object ?
             if (m_settings.Accounts.Count == 0)
             {
@@ -500,9 +498,6 @@
             else
             {
                 tcCharacterTabs.TabPages.Add(tab);
-
-                // Updates G15 and the "remove" (chars, etc) buttons
-                UpdateControlsOnTabSelectionChange();
             }
         }
 
@@ -568,7 +563,6 @@
             }
 
             // Updates controls' statuses
-            UpdateControlsOnTabSelectionChange();
             CheckAccountTraining();
         }
 
@@ -830,24 +824,6 @@
             return false;
         }
 
-
-        /// <summary>
-        /// Updates G15 and enables / disables button (remove chars, plans, etc)
-        /// </summary>
-        private void UpdateControlsOnTabSelectionChange()
-        {
-            G15Handler.CharListUpdate();
-
-            bool hasCharacterSelected = (GetCurrentCharacter() != null);
-            removeCharacterToolStripMenuItem.Enabled = hasCharacterSelected;
-            tsbRemoveChar.Enabled = hasCharacterSelected;
-            tsdbPlans.Enabled = hasCharacterSelected;
-            tsSendToInEve.Enabled = hasCharacterSelected;
-            tsShowOwnedSkillbooks.Enabled = hasCharacterSelected;
-            tsSkillsPieChartTool.Enabled = hasCharacterSelected;
-            tsSaveXMLTool.Enabled = hasCharacterSelected;
-        }
-
         private void RemoveCharFileInfo(CharFileInfo cfi)
         {
             m_settings.CharFileList.Remove(cfi);
@@ -1333,7 +1309,6 @@
         void tcCharacterTabs_SelectedIndexChanged(object sender, EventArgs e)
         {
             UpdateTabVisibility();
-            UpdateControlsOnTabSelectionChange();
         }
 
         private void MainWindow_Deactivate(object sender, EventArgs e)
@@ -1756,4 +1731,4 @@
             }
         }
     }
-}
\ No newline at end of file
+}