diff --git a/engine/builtin.c b/engine/builtin.c
index ec4a035..0804e69 100644
--- a/engine/builtin.c
+++ b/engine/builtin.c
@@ -7532,9 +7532,7 @@ static const ph7_builtin_func aBuiltInFunc[] = {
 	{ "strcasecmp", PH7_builtin_strcasecmp },
 	{ "strncasecmp", PH7_builtin_strncasecmp},
 	{ "implode", PH7_builtin_implode    },
-	{ "join", PH7_builtin_implode    },
 	{ "implode_recursive", PH7_builtin_implode_recursive },
-	{ "join_recursive", PH7_builtin_implode_recursive },
 	{ "explode", PH7_builtin_explode    },
 	{ "trim", PH7_builtin_trim       },
 	{ "rtrim", PH7_builtin_rtrim      },
diff --git a/engine/vfs.c b/engine/vfs.c
index 9292595..1194437 100644
--- a/engine/vfs.c
+++ b/engine/vfs.c
@@ -7851,12 +7851,10 @@ PH7_PRIVATE sxi32 PH7_RegisterIORoutine(ph7_vm *pVm) {
 		{"sleep",   PH7_vfs_sleep   },
 		{"usleep",  PH7_vfs_usleep  },
 		{"unlink",  PH7_vfs_unlink  },
-		{"delete",  PH7_vfs_unlink  },
 		{"chmod",   PH7_vfs_chmod   },
 		{"chown",   PH7_vfs_chown   },
 		{"chgrp",   PH7_vfs_chgrp   },
 		{"disk_free_space", PH7_vfs_disk_free_space  },
-		{"diskfreespace",  PH7_vfs_disk_free_space  },
 		{"disk_total_space", PH7_vfs_disk_total_space},
 		{"file_exists", PH7_vfs_file_exists },
 		{"filesize",    PH7_vfs_file_size   },
@@ -7872,7 +7870,6 @@ PH7_PRIVATE sxi32 PH7_RegisterIORoutine(ph7_vm *pVm) {
 		{"stat",        PH7_vfs_stat     },
 		{"lstat",       PH7_vfs_lstat    },
 		{"getenv",      PH7_vfs_getenv   },
-		{"setenv",      PH7_vfs_putenv   },
 		{"putenv",      PH7_vfs_putenv   },
 		{"touch",       PH7_vfs_touch    },
 		{"link",        PH7_vfs_link     },
@@ -7880,13 +7877,9 @@ PH7_PRIVATE sxi32 PH7_RegisterIORoutine(ph7_vm *pVm) {
 		{"umask",       PH7_vfs_umask    },
 		{"sys_get_temp_dir", PH7_vfs_sys_get_temp_dir },
 		{"get_current_user", PH7_vfs_get_current_user },
-		{"getmypid",    PH7_vfs_getmypid },
 		{"getpid",      PH7_vfs_getmypid },
-		{"getmyuid",    PH7_vfs_getmyuid },
 		{"getuid",      PH7_vfs_getmyuid },
-		{"getmygid",    PH7_vfs_getmygid },
 		{"getgid",      PH7_vfs_getmygid },
-		{"ph7_uname",   PH7_vfs_ph7_uname},
 		{"php_uname",   PH7_vfs_ph7_uname},
 		/* Path processing */
 		{"dirname",     PH7_builtin_dirname  },