diff --git a/gfx/video_driver.c b/gfx/video_driver.c
index 6160e42892..1e0a6b08f1 100644
--- a/gfx/video_driver.c
+++ b/gfx/video_driver.c
@@ -1000,7 +1000,7 @@ bool video_monitor_get_fps(char *buf, size_t size,
          last_fps = TIME_TO_FPS(curr_time, new_time, FPS_UPDATE_INTERVAL);
          curr_time = new_time;
 
-         fill_string_concat(buf,
+         fill_pathname_noext(buf,
                video_driver_title_buf,
                " || ",
                size);
@@ -1945,7 +1945,8 @@ void video_driver_set_title_buf(void)
 {
    struct retro_system_info info;
    core_get_system_info(&info);
-   fill_string_concat(video_driver_title_buf, 
+
+   fill_pathname_noext(video_driver_title_buf, 
          msg_hash_to_str(MSG_PROGRAM),
          " ",
          sizeof(video_driver_title_buf));
diff --git a/libretro-common/file/file_path.c b/libretro-common/file/file_path.c
index d89fe1d450..4481635cac 100644
--- a/libretro-common/file/file_path.c
+++ b/libretro-common/file/file_path.c
@@ -612,14 +612,6 @@ void fill_string_join(char *out_path,
    retro_assert(strlcat(out_path, append, size) < size);
 }
 
-void fill_string_concat(char *out_path,
-      const char *str1, const char *str2,
-      size_t size)
-{
-   strlcpy(out_path, str1, size);
-   strlcat(out_path, str2, size);
-}
-
 /**
  * fill_pathname_join_delim:
  * @out_path           : output path
diff --git a/libretro-common/include/file/file_path.h b/libretro-common/include/file/file_path.h
index ea97375285..236991534a 100644
--- a/libretro-common/include/file/file_path.h
+++ b/libretro-common/include/file/file_path.h
@@ -331,10 +331,6 @@ void fill_pathname_join_noext(char *out_path,
 void fill_string_join(char *out_path,
       const char *path, size_t size);
 
-void fill_string_concat(char *out_path,
-      const char *str1, const char *str2,
-      size_t size);
-
 /**
  * fill_pathname_join_delim:
  * @out_path           : output path
diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c
index 5579a43bf1..6a793f2297 100644
--- a/menu/menu_displaylist.c
+++ b/menu/menu_displaylist.c
@@ -306,7 +306,7 @@ static int menu_displaylist_parse_core_info(menu_displaylist_info_t *info)
       return 0;
    }
 
-   fill_string_concat(tmp,
+   fill_pathname_noext(tmp,
          msg_hash_to_str(
             MENU_ENUM_LABEL_VALUE_CORE_INFO_CORE_NAME),
          ": ",
@@ -317,7 +317,7 @@ static int menu_displaylist_parse_core_info(menu_displaylist_info_t *info)
    menu_entries_add_enum(info->list, tmp, "",
          MSG_UNKNOWN, MENU_SETTINGS_CORE_INFO_NONE, 0, 0);
 
-   fill_string_concat(tmp,
+   fill_pathname_noext(tmp,
          msg_hash_to_str(MENU_ENUM_LABEL_VALUE_CORE_INFO_CORE_LABEL),
          ": ",
          sizeof(tmp));
@@ -328,7 +328,7 @@ static int menu_displaylist_parse_core_info(menu_displaylist_info_t *info)
 
    if (core_info->systemname)
    {
-      fill_string_concat(tmp,
+      fill_pathname_noext(tmp,
             msg_hash_to_str(
                MENU_ENUM_LABEL_VALUE_CORE_INFO_SYSTEM_NAME),
             ": ",
@@ -340,7 +340,7 @@ static int menu_displaylist_parse_core_info(menu_displaylist_info_t *info)
 
    if (core_info->system_manufacturer)
    {
-      fill_string_concat(tmp,
+      fill_pathname_noext(tmp,
             msg_hash_to_str(MENU_ENUM_LABEL_VALUE_CORE_INFO_SYSTEM_MANUFACTURER),
             ": ",
             sizeof(tmp));
@@ -351,7 +351,7 @@ static int menu_displaylist_parse_core_info(menu_displaylist_info_t *info)
 
    if (core_info->categories_list)
    {
-      fill_string_concat(tmp,
+      fill_pathname_noext(tmp,
             msg_hash_to_str(MENU_ENUM_LABEL_VALUE_CORE_INFO_CATEGORIES),
             ": ",
             sizeof(tmp));
@@ -363,7 +363,7 @@ static int menu_displaylist_parse_core_info(menu_displaylist_info_t *info)
 
    if (core_info->authors_list)
    {
-      fill_string_concat(tmp,
+      fill_pathname_noext(tmp,
             msg_hash_to_str(MENU_ENUM_LABEL_VALUE_CORE_INFO_AUTHORS),
             ": ",
             sizeof(tmp));
@@ -375,7 +375,7 @@ static int menu_displaylist_parse_core_info(menu_displaylist_info_t *info)
 
    if (core_info->permissions_list)
    {
-      fill_string_concat(tmp,
+      fill_pathname_noext(tmp,
             msg_hash_to_str(MENU_ENUM_LABEL_VALUE_CORE_INFO_PERMISSIONS),
             ": ",
             sizeof(tmp));
@@ -387,7 +387,7 @@ static int menu_displaylist_parse_core_info(menu_displaylist_info_t *info)
 
    if (core_info->licenses_list)
    {
-      fill_string_concat(tmp,
+      fill_pathname_noext(tmp,
             msg_hash_to_str(MENU_ENUM_LABEL_VALUE_CORE_INFO_LICENSES),
             ": ",
             sizeof(tmp));
@@ -399,7 +399,7 @@ static int menu_displaylist_parse_core_info(menu_displaylist_info_t *info)
 
    if (core_info->supported_extensions_list)
    {
-      fill_string_concat(tmp,
+      fill_pathname_noext(tmp,
             msg_hash_to_str(MENU_ENUM_LABEL_VALUE_CORE_INFO_SUPPORTED_EXTENSIONS),
             ": ",
             sizeof(tmp));
@@ -418,7 +418,7 @@ static int menu_displaylist_parse_core_info(menu_displaylist_info_t *info)
 
       if (core_info_list_update_missing_firmware(&firmware_info))
       {
-         fill_string_concat(tmp,
+         fill_pathname_noext(tmp,
                msg_hash_to_str(MENU_ENUM_LABEL_VALUE_CORE_INFO_FIRMWARE),
                ": ",
                sizeof(tmp));
@@ -459,7 +459,7 @@ static int menu_displaylist_parse_core_info(menu_displaylist_info_t *info)
 
    if (core_info->notes)
    {
-      fill_string_concat(tmp,
+      fill_pathname_noext(tmp,
             msg_hash_to_str(MENU_ENUM_LABEL_VALUE_CORE_INFO_CORE_NOTES),
             ": ",
             sizeof(tmp));
@@ -657,7 +657,7 @@ static int menu_displaylist_parse_system_info(menu_displaylist_info_t *info)
    (void)tmp_string;
 
 #ifdef HAVE_GIT_VERSION
-   fill_string_concat(tmp,
+   fill_pathname_noext(tmp,
          msg_hash_to_str(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_GIT_VERSION),
          ": ",
          sizeof(tmp));
@@ -681,7 +681,7 @@ static int menu_displaylist_parse_system_info(menu_displaylist_info_t *info)
    {
       char cpu_str[PATH_MAX_LENGTH] = {0};
 
-      fill_string_concat(cpu_str,
+      fill_pathname_noext(cpu_str,
             msg_hash_to_str(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_CPU_FEATURES),
             ": ",
             sizeof(cpu_str));
@@ -770,7 +770,7 @@ static int menu_displaylist_parse_system_info(menu_displaylist_info_t *info)
       int                  major = 0;
       int                  minor = 0;
 
-      fill_string_concat(tmp,
+      fill_pathname_noext(tmp,
             msg_hash_to_str(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_FRONTEND_IDENTIFIER),
             ": ",
             sizeof(tmp));
@@ -782,7 +782,7 @@ static int menu_displaylist_parse_system_info(menu_displaylist_info_t *info)
       {
          frontend->get_name(tmp2, sizeof(tmp2));
 
-         fill_string_concat(tmp,
+         fill_pathname_noext(tmp,
                msg_hash_to_str(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_FRONTEND_NAME),
                ": ",
                sizeof(tmp));
@@ -930,7 +930,7 @@ static int menu_displaylist_parse_system_info(menu_displaylist_info_t *info)
                break;
          }
 
-         fill_string_concat(tmp,
+         fill_pathname_noext(tmp,
                msg_hash_to_str(
                   MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_POWER_SOURCE),
                ": ",
@@ -945,7 +945,7 @@ static int menu_displaylist_parse_system_info(menu_displaylist_info_t *info)
    video_context_driver_get_ident(&ident_info);
    tmp_string = ident_info.ident;
 
-   fill_string_concat(tmp,
+   fill_pathname_noext(tmp,
          msg_hash_to_str(
             MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_VIDEO_CONTEXT_DRIVER),
          ": ",
@@ -1002,7 +1002,7 @@ static int menu_displaylist_parse_system_info(menu_displaylist_info_t *info)
    }
 #endif
 
-   fill_string_concat(feat_str,
+   fill_pathname_noext(feat_str,
          msg_hash_to_str(
             MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_LIBRETRODB_SUPPORT),
          ": ",
@@ -1016,7 +1016,7 @@ static int menu_displaylist_parse_system_info(menu_displaylist_info_t *info)
          MSG_UNKNOWN,
          MENU_SETTINGS_CORE_INFO_NONE, 0, 0);
 
-   fill_string_concat(feat_str,
+   fill_pathname_noext(feat_str,
          msg_hash_to_str(
             MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_OVERLAY_SUPPORT),
          ": ",
@@ -1029,7 +1029,7 @@ static int menu_displaylist_parse_system_info(menu_displaylist_info_t *info)
          MSG_UNKNOWN,
          MENU_SETTINGS_CORE_INFO_NONE, 0, 0);
 
-   fill_string_concat(feat_str,
+   fill_pathname_noext(feat_str,
          msg_hash_to_str(
             MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_COMMAND_IFACE_SUPPORT),
          ": ",
@@ -1660,7 +1660,7 @@ static int create_string_list_rdb_entry_string(
 
    string_list_join_concat(output_label, str_len, str_list, "|");
 
-   fill_string_concat(tmp, desc, ": ", sizeof(tmp));
+   fill_pathname_noext(tmp, desc, ": ", sizeof(tmp));
    strlcat(tmp, actual_string, sizeof(tmp));
    menu_entries_add_enum(list, tmp, output_label,
          MSG_UNKNOWN,
@@ -1825,7 +1825,7 @@ static int menu_displaylist_parse_database_entry(menu_displaylist_info_t *info)
 
       if (db_info_entry->name)
       {
-         fill_string_concat(tmp,
+         fill_pathname_noext(tmp,
                msg_hash_to_str(MENU_ENUM_LABEL_VALUE_RDB_ENTRY_NAME),
                ": ",
                sizeof(tmp));
@@ -1837,7 +1837,7 @@ static int menu_displaylist_parse_database_entry(menu_displaylist_info_t *info)
       }
       if (db_info_entry->description)
       {
-         fill_string_concat(tmp,
+         fill_pathname_noext(tmp,
                msg_hash_to_str(MENU_ENUM_LABEL_VALUE_RDB_ENTRY_DESCRIPTION),
                ": ",
                sizeof(tmp));
@@ -1849,7 +1849,7 @@ static int menu_displaylist_parse_database_entry(menu_displaylist_info_t *info)
       }
       if (db_info_entry->genre)
       {
-         fill_string_concat(tmp,
+         fill_pathname_noext(tmp,
                msg_hash_to_str(MENU_ENUM_LABEL_VALUE_RDB_ENTRY_GENRE),
                ": ",
                sizeof(tmp));
diff --git a/menu/menu_setting.c b/menu/menu_setting.c
index c41486b2de..ccde62cc6f 100644
--- a/menu/menu_setting.c
+++ b/menu/menu_setting.c
@@ -3885,7 +3885,7 @@ static bool setting_append_list_input_player_options(
       if (input_config_bind_map_get_meta(i))
          continue;
 
-      fill_string_concat(label, buffer[user],
+      fill_pathname_noext(label, buffer[user],
             " ",
             sizeof(label));
       if (