diff --git a/gettext-bin/libexpat.dll b/gettext-bin/libexpat.dll
deleted file mode 100644
index 13bc7ee..0000000
Binary files a/gettext-bin/libexpat.dll and /dev/null differ
diff --git a/gettext-bin/libgettextlib.dll b/gettext-bin/libgettextlib.dll
deleted file mode 100644
index 6bc7525..0000000
Binary files a/gettext-bin/libgettextlib.dll and /dev/null differ
diff --git a/gettext-bin/libgettextpo.dll b/gettext-bin/libgettextpo.dll
deleted file mode 100644
index 9a9aa3f..0000000
Binary files a/gettext-bin/libgettextpo.dll and /dev/null differ
diff --git a/gettext-bin/libgettextsrc.dll b/gettext-bin/libgettextsrc.dll
deleted file mode 100644
index 0d5a593..0000000
Binary files a/gettext-bin/libgettextsrc.dll and /dev/null differ
diff --git a/gettext-bin/libiconv2.dll b/gettext-bin/libiconv2.dll
deleted file mode 100644
index fb1ffba..0000000
Binary files a/gettext-bin/libiconv2.dll and /dev/null differ
diff --git a/gettext-bin/libintl3.dll b/gettext-bin/libintl3.dll
deleted file mode 100644
index ec11e6b..0000000
Binary files a/gettext-bin/libintl3.dll and /dev/null differ
diff --git a/gettext-bin/msgmerge.exe b/gettext-bin/msgmerge.exe
deleted file mode 100644
index dc5a3ff..0000000
Binary files a/gettext-bin/msgmerge.exe and /dev/null differ
diff --git a/gettext-bin/xgettext.exe b/gettext-bin/xgettext.exe
deleted file mode 100644
index 590a19b..0000000
Binary files a/gettext-bin/xgettext.exe and /dev/null differ
diff --git a/src/menu/InputGetterMenu.cpp b/src/menu/InputGetterMenu.cpp
index 60328e9..ff9feb9 100644
--- a/src/menu/InputGetterMenu.cpp
+++ b/src/menu/InputGetterMenu.cpp
@@ -131,13 +131,7 @@ void InputGetterMenu::GetInputs(CThread *thread, void *arg){
                         pad_result.vidpid.vid = hiddata[i].device_info.vidpid.vid;
                         pad_result.vidpid.pid = hiddata[i].device_info.vidpid.pid;
                         pad_result.active = 1;
-                        pad_result.type = CM_Type_Controller;
-
-                        if(pad_result.vidpid.vid == HID_KEYBOARD_VID && pad_result.vidpid.pid == HID_KEYBOARD_PID){
-                            pad_result.type = CM_Type_Keyboard;
-                        }else if(pad_result.vidpid.vid == HID_MOUSE_VID && pad_result.vidpid.pid == HID_MOUSE_PID){
-                            pad_result.type = CM_Type_Mouse;
-                        }
+                        pad_result.type = hiddata[i].type;
 
                         gotPress = 1;
                         log_printf("%04X %04X (PAD: %d) pressed a buttons %08X\n",hiddata[i].device_info.vidpid.vid,hiddata[i].device_info.vidpid.pid,j,hiddata[i].button_data[j].btn_h);
diff --git a/src/menu/drc/MainWindowContent.cpp b/src/menu/drc/MainWindowContent.cpp
index a39e196..e843fc7 100644
--- a/src/menu/drc/MainWindowContent.cpp
+++ b/src/menu/drc/MainWindowContent.cpp
@@ -87,7 +87,6 @@ void MainWindowContent::SetScreen(ContentTemplate * new_content){
 }
 
 void MainWindowContent::RemoveScreen(){
-    DEBUG_FUNCTION_LINE("%08X\n",content);
     remove(content);
     delete content;
     content = NULL;