diff --git a/src/gui/input/panels/ProControllerInputPanel.cpp b/src/gui/input/panels/ProControllerInputPanel.cpp
index dbb2df2e..254a3ab8 100644
--- a/src/gui/input/panels/ProControllerInputPanel.cpp
+++ b/src/gui/input/panels/ProControllerInputPanel.cpp
@@ -96,10 +96,7 @@ ProControllerInputPanel::ProControllerInputPanel(wxWindow* parent)
 
 	//////////////////////////////////////////////////////////////////
 
-	// LoadController(controller);
-
 	SetSizerAndFit(main_sizer);
-	//wxWindow::Show(show);
 }
 
 void ProControllerInputPanel::add_button_row(wxGridBagSizer *sizer, sint32 row, sint32 column, const ProController::ButtonId &button_id) {
diff --git a/src/gui/input/panels/VPADInputPanel.cpp b/src/gui/input/panels/VPADInputPanel.cpp
index 89f5bfed..fbcdfde4 100644
--- a/src/gui/input/panels/VPADInputPanel.cpp
+++ b/src/gui/input/panels/VPADInputPanel.cpp
@@ -139,13 +139,8 @@ VPADInputPanel::VPADInputPanel(wxWindow* parent)
 
 	//////////////////////////////////////////////////////////////////
 
-	//LoadController(controller);
-
 	SetSizer(main_sizer);
 	Layout();
-
-	//SetSizerAndFit(main_sizer);
-	//wxWindow::Show(show);
 }
 
 void VPADInputPanel::add_button_row(wxGridBagSizer *sizer, sint32 row, sint32 column, const VPADController::ButtonId &button_id) {
diff --git a/src/gui/input/panels/WiimoteInputPanel.cpp b/src/gui/input/panels/WiimoteInputPanel.cpp
index a9a97c53..fbc4e325 100644
--- a/src/gui/input/panels/WiimoteInputPanel.cpp
+++ b/src/gui/input/panels/WiimoteInputPanel.cpp
@@ -211,9 +211,6 @@ void WiimoteInputPanel::on_volume_change(wxCommandEvent& event)
 
 void WiimoteInputPanel::on_extension_change(wxCommandEvent& event)
 {
-	const auto obj = dynamic_cast<wxCheckBox*>(event.GetEventObject());
-	wxASSERT(obj);
-
 	if(m_motion_plus->GetValue() && m_nunchuck->GetValue())
 		set_active_device_type(kWAPDevMPLSFreeStyle);
 	else if(m_motion_plus->GetValue() && m_classic->GetValue())