diff --git a/input/hid/apple_input_hid.c b/input/hid/apple_input_hid.c
index 8a9bb18aee..ad2ef8bbb7 100644
--- a/input/hid/apple_input_hid.c
+++ b/input/hid/apple_input_hid.c
@@ -198,9 +198,8 @@ static void hid_manager_device_attached(void* context, IOReturn result,
       strlcpy(g_settings.input.device_names[connection->slot],
             device_name, sizeof(g_settings.input.device_names));
        
-       /* TODO - VID/PID? */
       input_config_autoconfigure_joypad(connection->slot,
-            device_name, 0, 0, apple_joypad.ident);
+            device_name, connection->v_id, connection->p_id, apple_joypad.ident);
       RARCH_LOG("Port %d: %s.\n", connection->slot, device_name);
    }
 }
diff --git a/retroarch.c b/retroarch.c
index 04f64c9142..2a67a0399f 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -2574,8 +2574,6 @@ static void main_clear_state_extern(void)
    deinit_subsystem_fullpaths();
    rarch_deinit_recording();
 
-
-
    deinit_log_file();
    history_playlist_free();