diff --git a/Modules/UnitFrames/Framework.lua b/Modules/UnitFrames/Framework.lua
index 262e1d7b..a2c427ec 100644
--- a/Modules/UnitFrames/Framework.lua
+++ b/Modules/UnitFrames/Framework.lua
@@ -158,31 +158,6 @@ function UF:OnEnable()
 	-- Build options
 	UF.Options:Initialize()
 
-	if EditModeManagerFrame then
-		local CheckedItems = {}
-		local frames = { ['boss'] = 'Boss', ['raid'] = 'Raid', ['arena'] = 'Arena', ['party'] = 'Party' }
-		for k, v in pairs(frames) do
-			EditModeManagerFrame.AccountSettings.Settings[v .. 'Frames'].Button:HookScript('OnClick', function(...)
-				if EditModeManagerFrame.AccountSettings.Settings[v .. 'Frames']:IsControlChecked() then
-					CheckedItems[k] = v
-				else
-					CheckedItems[k] = nil
-				end
-
-				SUI.MoveIt:MoveIt(k)
-			end)
-		end
-
-		EditModeManagerFrame:HookScript('OnHide', function()
-			for k, v in pairs(CheckedItems) do
-				EditModeManagerFrame.AccountSettings.Settings[v .. 'Frames']:SetControlChecked(false)
-				SUI.MoveIt:MoveIt(k)
-			end
-			MoveIt.MoverWatcher:Hide()
-			MoveIt.MoveEnabled = false
-		end)
-	end
-
 	SUI:AddChatCommand('BuffDebug', function(args)
 		local unit, spellId = strsplit(' ', args)
 
diff --git a/SpartanUI.toc b/SpartanUI.toc
index 34ada0bf..90ac7aa7 100644
--- a/SpartanUI.toc
+++ b/SpartanUI.toc
@@ -1,4 +1,4 @@
-## Interface: 30400
+## Interface: 30402
 ## Title: Spartan|cffe21f1fUI
 ## Notes: User Interface combining elegant artwork with well designed features.
 ## Version: @project-version@
diff --git a/SpartanUI_Wrath.toc b/SpartanUI_Wrath.toc
index 2b04d369..284cbe73 100644
--- a/SpartanUI_Wrath.toc
+++ b/SpartanUI_Wrath.toc
@@ -1,4 +1,4 @@
-## Interface: 30401
+## Interface: 30402
 ## Title: Spartan|cffe21f1fUI
 ## Notes: User Interface combining elegant artwork with well designed features.
 ## Version: @project-version@