diff --git a/libretro-common/file/file_path.c b/libretro-common/file/file_path.c
index 07b19e67fe..8d9eb8a73c 100644
--- a/libretro-common/file/file_path.c
+++ b/libretro-common/file/file_path.c
@@ -142,16 +142,14 @@ static int path_stat(const char *path, int32_t *size)
 {
    if (path_stat_cb != NULL)
       return path_stat_cb(path, NULL);
-   else
-      return retro_vfs_stat_impl(path, NULL);
+   return retro_vfs_stat_impl(path, NULL);
 }
 
 static int path_mkdir_norecurse(const char *dir)
 {
    if (path_mkdir_cb != NULL)
       return path_mkdir_cb(dir);
-   else
-      return retro_vfs_mkdir_impl(dir);
+   return retro_vfs_mkdir_impl(dir);
 }
 
 /**
diff --git a/libretro-common/file/retro_dirent.c b/libretro-common/file/retro_dirent.c
index 353a12e81b..752cbdad01 100644
--- a/libretro-common/file/retro_dirent.c
+++ b/libretro-common/file/retro_dirent.c
@@ -63,8 +63,7 @@ struct RDIR *retro_opendir_include_hidden(const char *name, bool include_hidden)
 {
    if (dirent_opendir_cb != NULL)
       return (struct RDIR *)dirent_opendir_cb(name, include_hidden);
-   else
-      return (struct RDIR *)retro_vfs_opendir_impl(name, include_hidden);
+   return (struct RDIR *)retro_vfs_opendir_impl(name, include_hidden);
 }
 
 struct RDIR *retro_opendir(const char *name)
@@ -82,16 +81,14 @@ int retro_readdir(struct RDIR *rdir)
 {
    if (dirent_readdir_cb != NULL)
       return dirent_readdir_cb((struct retro_vfs_dir_handle *)rdir);
-   else
-      return retro_vfs_readdir_impl((struct retro_vfs_dir_handle *)rdir);
+   return retro_vfs_readdir_impl((struct retro_vfs_dir_handle *)rdir);
 }
 
 const char *retro_dirent_get_name(struct RDIR *rdir)
 {
    if (dirent_dirent_get_name_cb != NULL)
       return dirent_dirent_get_name_cb((struct retro_vfs_dir_handle *)rdir);
-   else
-      return retro_vfs_dirent_get_name_impl((struct retro_vfs_dir_handle *)rdir);
+   return retro_vfs_dirent_get_name_impl((struct retro_vfs_dir_handle *)rdir);
 }
 
 /**
@@ -109,8 +106,7 @@ bool retro_dirent_is_dir(struct RDIR *rdir, const char *unused)
 {
    if (dirent_dirent_is_dir_cb != NULL)
       return dirent_dirent_is_dir_cb((struct retro_vfs_dir_handle *)rdir);
-   else
-      return retro_vfs_dirent_is_dir_impl((struct retro_vfs_dir_handle *)rdir);
+   return retro_vfs_dirent_is_dir_impl((struct retro_vfs_dir_handle *)rdir);
 }
 
 void retro_closedir(struct RDIR *rdir)