diff --git a/code/__DEFINES/preferences.dm b/code/__DEFINES/preferences.dm
index 551be3fc4ea..ffcc322c18b 100644
--- a/code/__DEFINES/preferences.dm
+++ b/code/__DEFINES/preferences.dm
@@ -33,12 +33,11 @@
 #define AMBIENT_OCCLUSION 2097152
 #define AZERTY 4194304
 #define NUMPAD_TARGET 8388606
-#define CHAT_GHOSTPDA 16777212‬
-#define TOGGLES_DEFAULT (CHAT_OOC|CHAT_DEAD|CHAT_GHOSTEARS|CHAT_GHOSTSIGHT|CHAT_PRAYER|CHAT_RADIO|CHAT_LOOC|MEMBER_PUBLIC|DONATOR_PUBLIC|NUMPAD_TARGET)
-#define TOGGLES_TOTAL 33554424‬ // If you add or remove a preference toggle above, make sure you update this define with the total value of the toggles combined. 
+#define CHAT_GHOSTPDA 16777212
+#define TOGGLES_TOTAL 33554361 // If you add or remove a preference toggle above, make sure you update this define with the total value of the toggles combined. 
 
 
-#define TOGGLES_DEFAULT (CHAT_OOC|CHAT_DEAD|CHAT_GHOSTEARS|CHAT_GHOSTSIGHT|CHAT_PRAYER|CHAT_RADIO|CHAT_LOOC|MEMBER_PUBLIC|DONATOR_PUBLIC|AMBIENT_OCCLUSION|CHAT_GHOSTPDA)
+#define TOGGLES_DEFAULT (CHAT_OOC|CHAT_DEAD|CHAT_GHOSTEARS|CHAT_GHOSTSIGHT|CHAT_PRAYER|CHAT_RADIO|CHAT_LOOC|MEMBER_PUBLIC|DONATOR_PUBLIC|AMBIENT_OCCLUSION|NUMPAD_TARGET|CHAT_GHOSTPDA)
 
 // Admin attack logs filter system, see /proc/add_attack_logs and /proc/msg_admin_attack
 #define ATKLOG_ALL	0
diff --git a/code/game/atoms_movable.dm b/code/game/atoms_movable.dm
index 86c245a191f..72d85ae9d30 100644
--- a/code/game/atoms_movable.dm
+++ b/code/game/atoms_movable.dm
@@ -146,7 +146,7 @@
 			// place due to a Crossed, Bumped, etc. call will interrupt
 			// the second half of the diagonal movement, or the second attempt
 			// at a first half if step() fails because we hit something.
-			if (direct & NORTH)
+			if(direct & NORTH)
 				if (direct & EAST)
 					if (step(src, NORTH) && moving_diagonally)
 						first_step_dir = NORTH
diff --git a/code/modules/client/client procs.dm b/code/modules/client/client procs.dm
index 9743586d46b..dd43d53f18f 100644
--- a/code/modules/client/client procs.dm	
+++ b/code/modules/client/client procs.dm	
@@ -370,6 +370,8 @@
 			to_chat(src, message)
 		clientmessages.Remove(ckey)
 
+	if(SSinput.initialized)
+		set_macros()
 
 	donator_check()
 	check_ip_intel()
@@ -405,10 +407,6 @@
 	if(!winexists(src, "asset_cache_browser")) // The client is using a custom skin, tell them.
 		to_chat(src, "<span class='warning'>Unable to access asset cache browser, if you are using a custom skin file, please allow DS to download the updated version, if you are not, then make a bug report. This is not a critical issue but can cause issues with resource downloading, as it is impossible to know when extra resources arrived to you.</span>")
 	
-	if(SSinput.initialized)
-		spawn(50) // without this input won't work on first connect
-			set_macros()
-	
 	//This is down here because of the browse() calls in tooltip/New()
 	if(!tooltips)
 		tooltips = new /datum/tooltip(src)
diff --git a/code/modules/mob/mob_movement.dm b/code/modules/mob/mob_movement.dm
index 4bbc079269c..bc73842159b 100644
--- a/code/modules/mob/mob_movement.dm
+++ b/code/modules/mob/mob_movement.dm
@@ -15,119 +15,7 @@
 			return 1
 	return (!mover.density || !density || lying)
 
-//The byond version of these verbs wait for the next tick before acting.
-//	instant verbs however can run mid tick or even during the time between ticks.
-//#define DO_MOVE(this_dir) var/final_dir = turn(this_dir, -dir2angle(dir)); Move(get_step(mob, final_dir), final_dir);
-/* 
-/client/verb/moveup()
-	set name = ".moveup"
-	set instant = 1
-	DO_MOVE(NORTH)
 
-/client/verb/movedown()
-	set name = ".movedown"
-	set instant = 1
-	DO_MOVE(SOUTH)
-
-/client/verb/moveright()
-	set name = ".moveright"
-	set instant = 1
-	DO_MOVE(EAST)
-
-/client/verb/moveleft()
-	set name = ".moveleft"
-	set instant = 1
-	DO_MOVE(WEST)
-/client/verb/moveupright()
-	set name = ".moveupright"
-	set instant = 1
-	DO_MOVE(NORTHEAST)
-/client/verb/movedownright()
-	set name = ".movedownright"
-	set instant = 1
-	DO_MOVE(SOUTHEAST)
-/client/verb/moveupleft()
-	set name = ".moveupleft"
-	set instant = 1
-	DO_MOVE(NORTHWEST)
-/client/verb/movedownleft()
-	set name = ".movedownleft"
-	set instant = 1
-	DO_MOVE(SOUTHWEST)			
- */
-//#undef DO_MOVE
-/* 
-/client/Northeast()
-	swap_hand()
-	return
-
-
-/client/Southeast()
-	attack_self()
-	return
-
-
-/client/Southwest()
-	if(iscarbon(usr))
-		var/mob/living/carbon/C = usr
-		C.toggle_throw_mode()
-	else if(isrobot(usr))
-		var/mob/living/silicon/robot/R = usr
-		var/module = R.get_selected_module()
-		if(!module)
-			to_chat(usr, "<span class='warning'>You have no module selected.</span>")
-			return
-		R.cycle_modules()
-		R.uneq_numbered(module)
-	else
-		to_chat(usr, "<span class='warning'>This mob type cannot throw items.</span>")
-	return
-
-
-/client/Northwest()
-	if(iscarbon(usr))
-		var/mob/living/carbon/C = usr
-		if(!C.get_active_hand())
-			to_chat(usr, "<span class='warning'>You have nothing to drop in your hand.</span>")
-			return
-		drop_item()
-	else if(isrobot(usr))
-		var/mob/living/silicon/robot/R = usr
-		if(!R.get_selected_module())
-			to_chat(usr, "<span class='warning'>You have no module selected.</span>")
-			return
-		R.deselect_module(R.get_selected_module())
-	else
-		to_chat(usr, "<span class='warning'>This mob type cannot drop items.</span>")
-	return
-
-//This gets called when you press the delete button.
-/client/verb/delete_key_pressed()
-	set hidden = 1
-
-	if(!usr.pulling)
-		to_chat(usr, "<span class='notice'>You are not pulling anything.</span>")
-		return
-	usr.stop_pulling()
-
-/client/verb/swap_hand()
-	set hidden = 1
-	if(istype(mob, /mob/living/carbon))
-		mob:swap_hand()
-	if(istype(mob,/mob/living/silicon/robot))
-		var/mob/living/silicon/robot/R = mob
-		R.cycle_modules()
-	return
-
-
-
-/client/verb/attack_self()
-	set hidden = 1
-	if(mob)
-		mob.mode()
-	return
-
- */
 /client/verb/toggle_throw_mode()
 	set hidden = 1
 	if(iscarbon(mob))
diff --git a/goon/browserassets/js/browserOutput.js b/goon/browserassets/js/browserOutput.js
index d23b5a71ad0..1fcca3c6068 100644
--- a/goon/browserassets/js/browserOutput.js
+++ b/goon/browserassets/js/browserOutput.js
@@ -1046,14 +1046,6 @@ $(function() {
 		location.reload();
 	});
 
-	// Tell BYOND to give us a macro list.
-	// I don't know why but for some retarded reason,
-	// You need to activate hotkeymode before you can winget the macros in it.
-	runByond('byond://winset?id=mainwindow&macro=hotkeymode')
-	runByond('byond://winset?id=mainwindow&macro=macro')
-
-	runByond('byond://winget?callback=wingetMacros&id=hotkeymode.*&property=command');
-
 	/*****************************************
 	*
 	* KICK EVERYTHING OFF