diff --git a/Assets/PerfectWorld/Scripts/Managers/A3DSkillGfxMan.cs b/Assets/PerfectWorld/Scripts/Managers/A3DSkillGfxMan.cs
index 85239409ae..cc007aae1c 100644
--- a/Assets/PerfectWorld/Scripts/Managers/A3DSkillGfxMan.cs
+++ b/Assets/PerfectWorld/Scripts/Managers/A3DSkillGfxMan.cs
@@ -104,6 +104,10 @@ namespace BrewMonster
 
             return bRet;
         }
+        public  virtual void Dispose() {
+            Instance = null;
+        }
+
         public bool AddOneSkillGfxEvent(
           A3DSkillGfxComposer pComposer,
           long nHostID,
diff --git a/Assets/PerfectWorld/Scripts/Managers/CECAttacksMan.cs b/Assets/PerfectWorld/Scripts/Managers/CECAttacksMan.cs
index 4315d3288d..387f8bd667 100644
--- a/Assets/PerfectWorld/Scripts/Managers/CECAttacksMan.cs
+++ b/Assets/PerfectWorld/Scripts/Managers/CECAttacksMan.cs
@@ -30,7 +30,7 @@ namespace BrewMonster
         protected override void OnDestroy()
         {
             m_targets = null;
-            SkillGfxMan.InstanceSub = null;
+            SkillGfxMan.InstanceSub.Dispose();
             base.OnDestroy();
         }
         private void Start()
@@ -1497,3 +1497,4 @@ public enum GfxSkillValType
     enumGfxSkillFloat,
     enumGfxSkillValTypeNum
 };
+
diff --git a/Assets/PerfectWorld/Scripts/Managers/CECSkillGfxMan.cs b/Assets/PerfectWorld/Scripts/Managers/CECSkillGfxMan.cs
index ef6f3081ae..4952952b68 100644
--- a/Assets/PerfectWorld/Scripts/Managers/CECSkillGfxMan.cs
+++ b/Assets/PerfectWorld/Scripts/Managers/CECSkillGfxMan.cs
@@ -747,7 +747,11 @@ namespace BrewMonster
             m_pNPCMan = EC_ManMessageMono.Instance?.CECNPCMan;
         }
 
-        
+        public override void Dispose()
+        {
+            base.Dispose();
+            InstanceSub = null;
+        }
         public A3DSkillGfxEvent GetEmptyEvent(GfxMoveMode mode)
         {
             int modeIndex = (int)mode;
diff --git a/Assets/PerfectWorld/Scripts/Managers/EC_HostInputFilter.cs b/Assets/PerfectWorld/Scripts/Managers/EC_HostInputFilter.cs
index 89884d340e..1dc3d7ea67 100644
--- a/Assets/PerfectWorld/Scripts/Managers/EC_HostInputFilter.cs
+++ b/Assets/PerfectWorld/Scripts/Managers/EC_HostInputFilter.cs
@@ -59,7 +59,6 @@ namespace BrewMonster
             }
             if (Input.GetKeyDown(KeyCode.H))
             {
-                BMLogger.LogError("Input.GetKeyDown(KeyCode.H)");
                 CycleSkillShortcuts();
             }
 #endif
diff --git a/Assets/Scripts/CECHostPlayer.cs b/Assets/Scripts/CECHostPlayer.cs
index 4b3521f7d9..c953fdd480 100644
--- a/Assets/Scripts/CECHostPlayer.cs
+++ b/Assets/Scripts/CECHostPlayer.cs
@@ -419,12 +419,6 @@ namespace BrewMonster
             {
                 pointCam.rotation = Quaternion.identity;
             }
-#if UNITY_EDITOR
-            if (Input.GetKeyDown(KeyCode.C))
-            {
-                ApplySkillShortcut(1);
-            }
-#endif
 
             //	Update cursor based on what's under mouse
             EstimateCursor();