diff --git a/plugins/LilyPad/Config.cpp b/plugins/LilyPad/Config.cpp
index f8d59dc5d8..0dde5eab5c 100644
--- a/plugins/LilyPad/Config.cpp
+++ b/plugins/LilyPad/Config.cpp
@@ -48,7 +48,6 @@ void PCSX2_overrideConfig(GeneralConfig &config_in_out)
     config_in_out.disableScreenSaver = 0;   // Not required - handled internally by PCSX2
     config_in_out.escapeFullscreenHack = 0; // Not required - handled internally by PCSX2
     config_in_out.saveStateTitle = 0;       // Not required - handled internally by PCSX2
-    config_in_out.closeHack = 0;            // Cannot function when used by PCSX2
 }
 
 GeneralConfig config;
@@ -857,7 +856,6 @@ int SaveSettings(wchar_t *file = 0)
     for (int i = 0; i < sizeof(BoolOptionsInfo) / sizeof(BoolOptionsInfo[0]); i++) {
         noError &= WritePrivateProfileInt(L"General Settings", BoolOptionsInfo[i].name, config.bools[i], file);
     }
-    WritePrivateProfileInt(L"General Settings", L"Close Hack", config.closeHack, file);
 
     WritePrivateProfileInt(L"General Settings", L"Keyboard Mode", config.keyboardApi, file);
     WritePrivateProfileInt(L"General Settings", L"Mouse Mode", config.mouseApi, file);
@@ -966,7 +964,6 @@ int LoadSettings(int force, wchar_t *file)
     for (int i = 0; i < sizeof(BoolOptionsInfo) / sizeof(BoolOptionsInfo[0]); i++) {
         config.bools[i] = GetPrivateProfileBool(L"General Settings", BoolOptionsInfo[i].name, BoolOptionsInfo[i].defaultValue, file);
     }
-    config.closeHack = (u8)GetPrivateProfileIntW(L"General Settings", L"Close Hack", 0, file);
 
     config.keyboardApi = (DeviceAPI)GetPrivateProfileIntW(L"General Settings", L"Keyboard Mode", WM, file);
     if (!config.keyboardApi)
diff --git a/plugins/LilyPad/Config.h b/plugins/LilyPad/Config.h
index 7f3c38e8de..75b754a8e8 100644
--- a/plugins/LilyPad/Config.h
+++ b/plugins/LilyPad/Config.h
@@ -23,7 +23,6 @@ extern const wchar_t *padTypes[numPadTypes];
 struct PadConfig
 {
     PadType type;
-    u8 autoAnalog;
 };
 
 struct GeneralConfig
@@ -33,8 +32,6 @@ public:
 
     int deviceSelect[2][4];
 
-    u8 closeHack;
-
     DeviceAPI keyboardApi;
     DeviceAPI mouseApi;
 
diff --git a/plugins/LilyPad/LilyPad.cpp b/plugins/LilyPad/LilyPad.cpp
index a83be974a9..8bdfeac592 100644
--- a/plugins/LilyPad/LilyPad.cpp
+++ b/plugins/LilyPad/LilyPad.cpp
@@ -977,12 +977,6 @@ ExtraWndProcResult StatusWndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lPa
             // Note - I never managed to see this case entered, but SET/KILLFOCUS are entered. - avih 2014-04-16
             PrepareActivityState(LOWORD(wParam) != WA_INACTIVE);
             break;
-        case WM_CLOSE:
-            if (config.closeHack) {
-                ExitProcess(0);
-                return NO_WND_PROC;
-            }
-            break;
         case WM_DESTROY:
             QueueKeyEvent(VK_ESCAPE, KEYPRESS);
             break;
@@ -1234,9 +1228,6 @@ u8 CALLBACK PADpoll(u8 value)
             // CONFIG_MODE
             case 0x43:
                 if (pad->config && padtype != neGconPad) {
-                    if (pad->mode == MODE_DIGITAL && padtype == Dualshock2Pad && config.padConfigs[query.port][query.slot].autoAnalog) {
-                        pad->mode = MODE_ANALOG;
-                    }
                     // In config mode.  Might not actually be leaving it.
                     SET_RESULT(ConfigExit);
                     DEBUG_OUT(0xF3);
@@ -1459,9 +1450,6 @@ u8 CALLBACK PADpoll(u8 value)
                         pad->modeLock = 3;
                     } else {
                         pad->modeLock = 0;
-                        if (pad->mode == MODE_DIGITAL && padtype == Dualshock2Pad && config.padConfigs[query.port][query.slot].autoAnalog) {
-                            pad->mode = MODE_ANALOG;
-                        }
                     }
                     query.queryDone = 1;
                 }
diff --git a/plugins/LilyPad/Linux/Config.cpp b/plugins/LilyPad/Linux/Config.cpp
index 46e51ec287..b0726c8c8b 100644
--- a/plugins/LilyPad/Linux/Config.cpp
+++ b/plugins/LilyPad/Linux/Config.cpp
@@ -227,7 +227,6 @@ int SaveSettings(wchar_t *file = 0)
     for (size_t i = 0; i < sizeof(BoolOptionsInfo) / sizeof(BoolOptionsInfo[0]); i++) {
         cfg.WriteBool(L"General Settings", BoolOptionsInfo[i].name, config.bools[i]);
     }
-    cfg.WriteInt(L"General Settings", L"Close Hack", config.closeHack);
 
     cfg.WriteInt(L"General Settings", L"Keyboard Mode", config.keyboardApi);
     cfg.WriteInt(L"General Settings", L"Mouse Mode", config.mouseApi);
@@ -237,7 +236,6 @@ int SaveSettings(wchar_t *file = 0)
             wchar_t temp[50];
             wsprintf(temp, L"Pad %i %i", port, slot);
             cfg.WriteInt(temp, L"Mode", config.padConfigs[port][slot].type);
-            cfg.WriteInt(temp, L"Auto Analog", config.padConfigs[port][slot].autoAnalog);
         }
     }
 
@@ -317,8 +315,6 @@ int LoadSettings(int force, wchar_t *file)
         config.bools[i] = cfg.ReadBool(L"General Settings", BoolOptionsInfo[i].name, BoolOptionsInfo[i].defaultValue);
     }
 
-    config.closeHack = (u8)cfg.ReadInt(L"General Settings", L"Close Hack");
-
     config.keyboardApi = (DeviceAPI)cfg.ReadInt(L"General Settings", L"Keyboard Mode", LNX_KEYBOARD);
     if (!config.keyboardApi)
         config.keyboardApi = LNX_KEYBOARD;
@@ -329,7 +325,6 @@ int LoadSettings(int force, wchar_t *file)
             wchar_t temp[50];
             wsprintf(temp, L"Pad %i %i", port, slot);
             config.padConfigs[port][slot].type = (PadType)cfg.ReadInt(temp, L"Mode", Dualshock2Pad);
-            config.padConfigs[port][slot].autoAnalog = cfg.ReadBool(temp, L"Auto Analog");
         }
     }