diff --git a/remote.c b/remote.c
index 68baef34c9..b32828065e 100644
--- a/remote.c
+++ b/remote.c
@@ -65,7 +65,8 @@ static input_remote_state_t *input_remote_get_state_ptr(void)
 }
 
 #if defined(HAVE_NETWORK_GAMEPAD) && defined(HAVE_NETPLAY)
-static bool remote_init_network(rarch_remote_t *handle, uint16_t port, unsigned user)
+static bool remote_init_network(rarch_remote_t *handle,
+      uint16_t port, unsigned user)
 {
    struct addrinfo hints = {0};
    char port_buf[16]     = {0};
@@ -125,7 +126,8 @@ rarch_remote_t *rarch_remote_new(uint16_t port)
 #if defined(HAVE_NETWORK_GAMEPAD) && defined(HAVE_NETPLAY)
    settings_t   *settings = config_get_ptr();
 #endif
-   rarch_remote_t *handle = (rarch_remote_t*)calloc(1, sizeof(*handle));
+   rarch_remote_t *handle = (rarch_remote_t*)
+      calloc(1, sizeof(*handle));
 
    if (!handle)
       return NULL;
diff --git a/retroarch.c b/retroarch.c
index 07d8948b71..4198150320 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -381,8 +381,6 @@ static void set_special_paths(char **argv, unsigned num_content)
       return;
 
    RARCH_WARN("SYSTEM DIR is empty, assume CONTENT DIR %s\n",argv[0]);
-   /*fill_pathname_basedir(settings->system_directory, argv[0],
-     sizeof(settings->system_directory));*/
 }
 
 const char *rarch_get_current_savefile_dir(void)