diff --git a/Source/Android/app/src/main/assets/GCPadNew.ini b/Source/Android/app/src/main/assets/GCPadNew.ini
index 8724ea70ff..2bf8ffdac3 100644
--- a/Source/Android/app/src/main/assets/GCPadNew.ini
+++ b/Source/Android/app/src/main/assets/GCPadNew.ini
@@ -14,14 +14,10 @@ Main Stick/Up = `Axis 11`
 Main Stick/Down = `Axis 12`
 Main Stick/Left = `Axis 13`
 Main Stick/Right = `Axis 14`
-Main Stick/Calibration = 100,00 141,42 100,00 141,42 100,00 141,42 100,00 141,42
-Main Stick/Center = 0,00 0,00
 C-Stick/Up = `Axis 16`
 C-Stick/Down = `Axis 17`
 C-Stick/Left = `Axis 18`
 C-Stick/Right = `Axis 19`
-C-Stick/Calibration = 100,00 141,42 100,00 141,42 100,00 141,42 100,00 141,42
-C-Stick/Center = 0,00 0,00
 Triggers/L = `Axis 20`
 Triggers/R = `Axis 21`
 Triggers/L-Analog = `Axis 20`
@@ -44,14 +40,10 @@ Main Stick/Up = `Axis 11`
 Main Stick/Down = `Axis 12`
 Main Stick/Left = `Axis 13`
 Main Stick/Right = `Axis 14`
-Main Stick/Calibration = 100,00 141,42 100,00 141,42 100,00 141,42 100,00 141,42
-Main Stick/Center = 0,00 0,00
 C-Stick/Up = `Axis 16`
 C-Stick/Down = `Axis 17`
 C-Stick/Left = `Axis 18`
 C-Stick/Right = `Axis 19`
-C-Stick/Calibration = 100,00 141,42 100,00 141,42 100,00 141,42 100,00 141,42
-C-Stick/Center = 0,00 0,00
 Triggers/L = `Axis 20`
 Triggers/R = `Axis 21`
 Triggers/L-Analog = `Axis 20`
@@ -74,14 +66,10 @@ Main Stick/Up = `Axis 11`
 Main Stick/Down = `Axis 12`
 Main Stick/Left = `Axis 13`
 Main Stick/Right = `Axis 14`
-Main Stick/Calibration = 100,00 141,42 100,00 141,42 100,00 141,42 100,00 141,42
-Main Stick/Center = 0,00 0,00
 C-Stick/Up = `Axis 16`
 C-Stick/Down = `Axis 17`
 C-Stick/Left = `Axis 18`
 C-Stick/Right = `Axis 19`
-C-Stick/Calibration = 100,00 141,42 100,00 141,42 100,00 141,42 100,00 141,42
-C-Stick/Center = 0,00 0,00
 Triggers/L = `Axis 20`
 Triggers/R = `Axis 21`
 Triggers/L-Analog = `Axis 20`
@@ -104,14 +92,10 @@ Main Stick/Up = `Axis 11`
 Main Stick/Down = `Axis 12`
 Main Stick/Left = `Axis 13`
 Main Stick/Right = `Axis 14`
-Main Stick/Calibration = 100,00 141,42 100,00 141,42 100,00 141,42 100,00 141,42
-Main Stick/Center = 0,00 0,00
 C-Stick/Up = `Axis 16`
 C-Stick/Down = `Axis 17`
 C-Stick/Left = `Axis 18`
 C-Stick/Right = `Axis 19`
-C-Stick/Calibration = 100,00 141,42 100,00 141,42 100,00 141,42 100,00 141,42
-C-Stick/Center = 0,00 0,00
 Triggers/L = `Axis 20`
 Triggers/R = `Axis 21`
 Triggers/L-Analog = `Axis 20`
diff --git a/Source/Android/app/src/main/assets/WiimoteNew.ini b/Source/Android/app/src/main/assets/WiimoteNew.ini
index 74d954e9bc..4e98e22f18 100644
--- a/Source/Android/app/src/main/assets/WiimoteNew.ini
+++ b/Source/Android/app/src/main/assets/WiimoteNew.ini
@@ -43,8 +43,6 @@ Nunchuk/Stick/Up = `Axis 203`
 Nunchuk/Stick/Down = `Axis 204`
 Nunchuk/Stick/Left = `Axis 205`
 Nunchuk/Stick/Right = `Axis 206`
-Nunchuk/Stick/Calibration = 100,00 141,42 100,00 141,42 100,00 141,42 100,00 141,42
-Nunchuk/Stick/Center = 0,00 0,00
 Nunchuk/Swing/Up = `Axis 208`
 Nunchuk/Swing/Down = `Axis 209`
 Nunchuk/Swing/Left = `Axis 210`
@@ -77,14 +75,10 @@ Classic/Left Stick/Up = `Axis 314`
 Classic/Left Stick/Down = `Axis 315`
 Classic/Left Stick/Left = `Axis 316`
 Classic/Left Stick/Right = `Axis 317`
-Classic/Left Stick/Calibration = 100,00 141,42 100,00 141,42 100,00 141,42 100,00 141,42
-Classic/Left Stick/Center = 0,00 0,00
 Classic/Right Stick/Up = `Axis 319`
 Classic/Right Stick/Down = `Axis 320`
 Classic/Right Stick/Left = `Axis 321`
 Classic/Right Stick/Right = `Axis 322`
-Classic/Right Stick/Calibration = 100,00 141,42 100,00 141,42 100,00 141,42 100,00 141,42
-Classic/Right Stick/Center = 0,00 0,00
 Classic/Triggers/L = `Axis 323`
 Classic/Triggers/R = `Axis 324`
 Classic/Triggers/Threshold = 90,000000
@@ -101,8 +95,6 @@ Guitar/Stick/Up = `Axis 410`
 Guitar/Stick/Down = `Axis 411`
 Guitar/Stick/Left = `Axis 412`
 Guitar/Stick/Right = `Axis 413`
-Guitar/Stick/Calibration = 100,00 141,42 100,00 141,42 100,00 141,42 100,00 141,42
-Guitar/Stick/Center = 0,00 0,00
 Guitar/Whammy/Bar = `Axis 414`
 Drums/Buttons/- = `Button 500`
 Drums/Buttons/+ = `Button 501`
@@ -116,8 +108,6 @@ Drums/Stick/Up = `Axis 509`
 Drums/Stick/Down = `Axis 510`
 Drums/Stick/Left = `Axis 511`
 Drums/Stick/Right = `Axis 512`
-Drums/Stick/Calibration = 100,00 141,42 100,00 141,42 100,00 141,42 100,00 141,42
-Drums/Stick/Center = 0,00 0,00
 Turntable/Buttons/Green Left = `Button 600`
 Turntable/Buttons/Red Left = `Button 601`
 Turntable/Buttons/Blue Left = `Button 602`
@@ -136,8 +126,6 @@ Turntable/Stick/Up = `Axis 617`
 Turntable/Stick/Down = `Axis 618`
 Turntable/Stick/Left = `Axis 619`
 Turntable/Stick/Right = `Axis 620`
-Turntable/Stick/Calibration = 100,00 141,42 100,00 141,42 100,00 141,42 100,00 141,42
-Turntable/Stick/Center = 0,00 0,00
 Turntable/Effect/Dial = `Axis 621`
 Turntable/Crossfade/Left = `Axis 623`
 Turntable/Crossfade/Right = `Axis 624`
@@ -200,8 +188,6 @@ Nunchuk/Stick/Up = `Axis 203`
 Nunchuk/Stick/Down = `Axis 204`
 Nunchuk/Stick/Left = `Axis 205`
 Nunchuk/Stick/Right = `Axis 206`
-Nunchuk/Stick/Calibration = 100,00 141,42 100,00 141,42 100,00 141,42 100,00 141,42
-Nunchuk/Stick/Center = 0,00 0,00
 Nunchuk/Swing/Up = `Axis 208`
 Nunchuk/Swing/Down = `Axis 209`
 Nunchuk/Swing/Left = `Axis 210`
@@ -234,14 +220,10 @@ Classic/Left Stick/Up = `Axis 314`
 Classic/Left Stick/Down = `Axis 315`
 Classic/Left Stick/Left = `Axis 316`
 Classic/Left Stick/Right = `Axis 317`
-Classic/Left Stick/Calibration = 100,00 141,42 100,00 141,42 100,00 141,42 100,00 141,42
-Classic/Left Stick/Center = 0,00 0,00
 Classic/Right Stick/Up = `Axis 319`
 Classic/Right Stick/Down = `Axis 320`
 Classic/Right Stick/Left = `Axis 321`
 Classic/Right Stick/Right = `Axis 322`
-Classic/Right Stick/Calibration = 100,00 141,42 100,00 141,42 100,00 141,42 100,00 141,42
-Classic/Right Stick/Center = 0,00 0,00
 Classic/Triggers/L = `Axis 323`
 Classic/Triggers/R = `Axis 324`
 Classic/Triggers/Threshold = 90,000000
@@ -258,8 +240,6 @@ Guitar/Stick/Up = `Axis 410`
 Guitar/Stick/Down = `Axis 411`
 Guitar/Stick/Left = `Axis 412`
 Guitar/Stick/Right = `Axis 413`
-Guitar/Stick/Calibration = 100,00 141,42 100,00 141,42 100,00 141,42 100,00 141,42
-Guitar/Stick/Center = 0,00 0,00
 Guitar/Whammy/Bar = `Axis 414`
 Drums/Buttons/- = `Button 500`
 Drums/Buttons/+ = `Button 501`
@@ -273,8 +253,6 @@ Drums/Stick/Up = `Axis 509`
 Drums/Stick/Down = `Axis 510`
 Drums/Stick/Left = `Axis 511`
 Drums/Stick/Right = `Axis 512`
-Drums/Stick/Calibration = 100,00 141,42 100,00 141,42 100,00 141,42 100,00 141,42
-Drums/Stick/Center = 0,00 0,00
 Turntable/Buttons/Green Left = `Button 600`
 Turntable/Buttons/Red Left = `Button 601`
 Turntable/Buttons/Blue Left = `Button 602`
@@ -293,8 +271,6 @@ Turntable/Stick/Up = `Axis 617`
 Turntable/Stick/Down = `Axis 618`
 Turntable/Stick/Left = `Axis 619`
 Turntable/Stick/Right = `Axis 620`
-Turntable/Stick/Calibration = 100,00 141,42 100,00 141,42 100,00 141,42 100,00 141,42
-Turntable/Stick/Center = 0,00 0,00
 Turntable/Effect/Dial = `Axis 621`
 Turntable/Crossfade/Left = `Axis 623`
 Turntable/Crossfade/Right = `Axis 624`
@@ -357,8 +333,6 @@ Nunchuk/Stick/Up = `Axis 203`
 Nunchuk/Stick/Down = `Axis 204`
 Nunchuk/Stick/Left = `Axis 205`
 Nunchuk/Stick/Right = `Axis 206`
-Nunchuk/Stick/Calibration = 100,00 141,42 100,00 141,42 100,00 141,42 100,00 141,42
-Nunchuk/Stick/Center = 0,00 0,00
 Nunchuk/Swing/Up = `Axis 208`
 Nunchuk/Swing/Down = `Axis 209`
 Nunchuk/Swing/Left = `Axis 210`
@@ -391,14 +365,10 @@ Classic/Left Stick/Up = `Axis 314`
 Classic/Left Stick/Down = `Axis 315`
 Classic/Left Stick/Left = `Axis 316`
 Classic/Left Stick/Right = `Axis 317`
-Classic/Left Stick/Calibration = 100,00 141,42 100,00 141,42 100,00 141,42 100,00 141,42
-Classic/Left Stick/Center = 0,00 0,00
 Classic/Right Stick/Up = `Axis 319`
 Classic/Right Stick/Down = `Axis 320`
 Classic/Right Stick/Left = `Axis 321`
 Classic/Right Stick/Right = `Axis 322`
-Classic/Right Stick/Calibration = 100,00 141,42 100,00 141,42 100,00 141,42 100,00 141,42
-Classic/Right Stick/Center = 0,00 0,00
 Classic/Triggers/L = `Axis 323`
 Classic/Triggers/R = `Axis 324`
 Classic/Triggers/Threshold = 90,000000
@@ -415,8 +385,6 @@ Guitar/Stick/Up = `Axis 410`
 Guitar/Stick/Down = `Axis 411`
 Guitar/Stick/Left = `Axis 412`
 Guitar/Stick/Right = `Axis 413`
-Guitar/Stick/Calibration = 100,00 141,42 100,00 141,42 100,00 141,42 100,00 141,42
-Guitar/Stick/Center = 0,00 0,00
 Guitar/Whammy/Bar = `Axis 414`
 Drums/Buttons/- = `Button 500`
 Drums/Buttons/+ = `Button 501`
@@ -430,8 +398,6 @@ Drums/Stick/Up = `Axis 509`
 Drums/Stick/Down = `Axis 510`
 Drums/Stick/Left = `Axis 511`
 Drums/Stick/Right = `Axis 512`
-Drums/Stick/Calibration = 100,00 141,42 100,00 141,42 100,00 141,42 100,00 141,42
-Drums/Stick/Center = 0,00 0,00
 Turntable/Buttons/Green Left = `Button 600`
 Turntable/Buttons/Red Left = `Button 601`
 Turntable/Buttons/Blue Left = `Button 602`
@@ -450,8 +416,6 @@ Turntable/Stick/Up = `Axis 617`
 Turntable/Stick/Down = `Axis 618`
 Turntable/Stick/Left = `Axis 619`
 Turntable/Stick/Right = `Axis 620`
-Turntable/Stick/Calibration = 100,00 141,42 100,00 141,42 100,00 141,42 100,00 141,42
-Turntable/Stick/Center = 0,00 0,00
 Turntable/Effect/Dial = `Axis 621`
 Turntable/Crossfade/Left = `Axis 623`
 Turntable/Crossfade/Right = `Axis 624`
@@ -514,8 +478,6 @@ Nunchuk/Stick/Up = `Axis 203`
 Nunchuk/Stick/Down = `Axis 204`
 Nunchuk/Stick/Left = `Axis 205`
 Nunchuk/Stick/Right = `Axis 206`
-Nunchuk/Stick/Calibration = 100,00 141,42 100,00 141,42 100,00 141,42 100,00 141,42
-Nunchuk/Stick/Center = 0,00 0,00
 Nunchuk/Swing/Up = `Axis 208`
 Nunchuk/Swing/Down = `Axis 209`
 Nunchuk/Swing/Left = `Axis 210`
@@ -548,14 +510,10 @@ Classic/Left Stick/Up = `Axis 314`
 Classic/Left Stick/Down = `Axis 315`
 Classic/Left Stick/Left = `Axis 316`
 Classic/Left Stick/Right = `Axis 317`
-Classic/Left Stick/Calibration = 100,00 141,42 100,00 141,42 100,00 141,42 100,00 141,42
-Classic/Left Stick/Center = 0,00 0,00
 Classic/Right Stick/Up = `Axis 319`
 Classic/Right Stick/Down = `Axis 320`
 Classic/Right Stick/Left = `Axis 321`
 Classic/Right Stick/Right = `Axis 322`
-Classic/Right Stick/Calibration = 100,00 141,42 100,00 141,42 100,00 141,42 100,00 141,42
-Classic/Right Stick/Center = 0,00 0,00
 Classic/Triggers/L = `Axis 323`
 Classic/Triggers/R = `Axis 324`
 Classic/Triggers/Threshold = 90,000000
@@ -572,8 +530,6 @@ Guitar/Stick/Up = `Axis 410`
 Guitar/Stick/Down = `Axis 411`
 Guitar/Stick/Left = `Axis 412`
 Guitar/Stick/Right = `Axis 413`
-Guitar/Stick/Calibration = 100,00 141,42 100,00 141,42 100,00 141,42 100,00 141,42
-Guitar/Stick/Center = 0,00 0,00
 Guitar/Whammy/Bar = `Axis 414`
 Drums/Buttons/- = `Button 500`
 Drums/Buttons/+ = `Button 501`
@@ -587,8 +543,6 @@ Drums/Stick/Up = `Axis 509`
 Drums/Stick/Down = `Axis 510`
 Drums/Stick/Left = `Axis 511`
 Drums/Stick/Right = `Axis 512`
-Drums/Stick/Calibration = 100,00 141,42 100,00 141,42 100,00 141,42 100,00 141,42
-Drums/Stick/Center = 0,00 0,00
 Turntable/Buttons/Green Left = `Button 600`
 Turntable/Buttons/Red Left = `Button 601`
 Turntable/Buttons/Blue Left = `Button 602`
@@ -607,8 +561,6 @@ Turntable/Stick/Up = `Axis 617`
 Turntable/Stick/Down = `Axis 618`
 Turntable/Stick/Left = `Axis 619`
 Turntable/Stick/Right = `Axis 620`
-Turntable/Stick/Calibration = 100,00 141,42 100,00 141,42 100,00 141,42 100,00 141,42
-Turntable/Stick/Center = 0,00 0,00
 Turntable/Effect/Dial = `Axis 621`
 Turntable/Crossfade/Left = `Axis 623`
 Turntable/Crossfade/Right = `Axis 624`
diff --git a/Source/Android/app/src/main/assets/WiimoteProfile.ini b/Source/Android/app/src/main/assets/WiimoteProfile.ini
index 12e41d713e..99aefd936e 100644
--- a/Source/Android/app/src/main/assets/WiimoteProfile.ini
+++ b/Source/Android/app/src/main/assets/WiimoteProfile.ini
@@ -43,8 +43,6 @@ Nunchuk/Stick/Up = `Axis 203`
 Nunchuk/Stick/Down = `Axis 204`
 Nunchuk/Stick/Left = `Axis 205`
 Nunchuk/Stick/Right = `Axis 206`
-Nunchuk/Stick/Calibration = 100,00 141,42 100,00 141,42 100,00 141,42 100,00 141,42
-Nunchuk/Stick/Center = 0,00 0,00
 Nunchuk/Swing/Up = `Axis 208`
 Nunchuk/Swing/Down = `Axis 209`
 Nunchuk/Swing/Left = `Axis 210`
@@ -77,14 +75,10 @@ Classic/Left Stick/Up = `Axis 314`
 Classic/Left Stick/Down = `Axis 315`
 Classic/Left Stick/Left = `Axis 316`
 Classic/Left Stick/Right = `Axis 317`
-Classic/Left Stick/Calibration = 100,00 141,42 100,00 141,42 100,00 141,42 100,00 141,42
-Classic/Left Stick/Center = 0,00 0,00
 Classic/Right Stick/Up = `Axis 319`
 Classic/Right Stick/Down = `Axis 320`
 Classic/Right Stick/Left = `Axis 321`
 Classic/Right Stick/Right = `Axis 322`
-Classic/Right Stick/Calibration = 100,00 141,42 100,00 141,42 100,00 141,42 100,00 141,42
-Classic/Right Stick/Center = 0,00 0,00
 Classic/Triggers/L = `Axis 323`
 Classic/Triggers/R = `Axis 324`
 Classic/Triggers/Threshold = 90,000000
@@ -101,8 +95,6 @@ Guitar/Stick/Up = `Axis 410`
 Guitar/Stick/Down = `Axis 411`
 Guitar/Stick/Left = `Axis 412`
 Guitar/Stick/Right = `Axis 413`
-Guitar/Stick/Calibration = 100,00 141,42 100,00 141,42 100,00 141,42 100,00 141,42
-Guitar/Stick/Center = 0,00 0,00
 Guitar/Whammy/Bar = `Axis 414`
 Drums/Buttons/- = `Button 500`
 Drums/Buttons/+ = `Button 501`
@@ -116,8 +108,6 @@ Drums/Stick/Up = `Axis 509`
 Drums/Stick/Down = `Axis 510`
 Drums/Stick/Left = `Axis 511`
 Drums/Stick/Right = `Axis 512`
-Drums/Stick/Calibration = 100,00 141,42 100,00 141,42 100,00 141,42 100,00 141,42
-Drums/Stick/Center = 0,00 0,00
 Turntable/Buttons/Green Left = `Button 600`
 Turntable/Buttons/Red Left = `Button 601`
 Turntable/Buttons/Blue Left = `Button 602`
@@ -136,8 +126,6 @@ Turntable/Stick/Up = `Axis 617`
 Turntable/Stick/Down = `Axis 618`
 Turntable/Stick/Left = `Axis 619`
 Turntable/Stick/Right = `Axis 620`
-Turntable/Stick/Calibration = 100,00 141,42 100,00 141,42 100,00 141,42 100,00 141,42
-Turntable/Stick/Center = 0,00 0,00
 Turntable/Effect/Dial = `Axis 621`
 Turntable/Crossfade/Left = `Axis 623`
 Turntable/Crossfade/Right = `Axis 624`
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/DirectoryInitialization.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/DirectoryInitialization.java
index ce097ec3e1..fbe5bc65ca 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/DirectoryInitialization.java
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/DirectoryInitialization.java
@@ -35,7 +35,7 @@ public final class DirectoryInitialization
           "org.dolphinemu.dolphinemu.DIRECTORY_INITIALIZATION";
 
   public static final String EXTRA_STATE = "directoryState";
-  private static final int WiimoteNewVersion = 4;  // Last changed in PR 8503
+  private static final int WiimoteNewVersion = 5;  // Last changed in PR 8907
   private static volatile DirectoryInitializationState directoryState = null;
   private static String userPath;
   private static String internalPath;