diff --git a/common/src/states/utils.rs b/common/src/states/utils.rs
index 03b4b7b73e..9e7db75345 100644
--- a/common/src/states/utils.rs
+++ b/common/src/states/utils.rs
@@ -138,16 +138,6 @@ pub fn handle_unwield(data: &JoinData, update: &mut StateUpdate) {
     }
 }
 
-/// Checks that player can Swap and updates Loadout
-pub fn handle_swap_loadout(data: &JoinData, update: &mut StateUpdate) {
-    if let CharacterState::Wielding { .. } = update.character {
-        if data.inputs.swap_loadout.is_pressed() {
-            //TODO
-            println!("YAH NAH");
-        }
-    }
-}
-
 /// Checks that player can glide and updates `CharacterState` if so
 pub fn handle_glide(data: &JoinData, update: &mut StateUpdate) {
     if let CharacterState::Idle { .. } | CharacterState::Wielding { .. } = update.character {
diff --git a/voxygen/src/session.rs b/voxygen/src/session.rs
index 5bee64ee03..f0e4be378d 100644
--- a/voxygen/src/session.rs
+++ b/voxygen/src/session.rs
@@ -319,11 +319,10 @@ impl PlayState for SessionState {
                     Event::InputUpdate(GameInput::WallLeap, state) => {
                         self.inputs.wall_leap.set_state(state)
                     },
-                    // Event::InputUpdate(GameInput::ToggleWield, state) => {
-                    //     self.inputs.toggle_wield.set_state(state);
-                    // },
-                    Event::InputUpdate(GameInput::ToggleWield, state)
-                    | Event::InputUpdate(GameInput::SwapLoadout, state) => {
+                    Event::InputUpdate(GameInput::ToggleWield, state) => {
+                        self.inputs.toggle_wield.set_state(state);
+                    },
+                    Event::InputUpdate(GameInput::SwapLoadout, state) => {
                         let mut client = self.client.borrow_mut();
                         let entity = client.entity();
                         let loadout = client