diff --git a/migrations/20210429194328-users-add-avatar.js b/migrations/20210429194328-users-add-avatar.js
index 1a75698d8..4babb5312 100644
--- a/migrations/20210429194328-users-add-avatar.js
+++ b/migrations/20210429194328-users-add-avatar.js
@@ -22,7 +22,7 @@ exports.up = function(db, callback) {
             }, function (error) {
                 if (error) return callback(error);
 
-                fs.rmdir(AVATAR_DIR, { recursive: true }, callback);
+                fs.rm(AVATAR_DIR, { recursive: true }, callback);
             });
         });
     });
diff --git a/migrations/20210430200947-apps-add-icon.js b/migrations/20210430200947-apps-add-icon.js
index bc549cbef..053bd57eb 100644
--- a/migrations/20210430200947-apps-add-icon.js
+++ b/migrations/20210430200947-apps-add-icon.js
@@ -27,7 +27,7 @@ exports.up = function(db, callback) {
                 }, function (error) {
                     if (error) return next(error);
 
-                    fs.rmdir(APPICONS_DIR, { recursive: true }, next);
+                    fs.rm(APPICONS_DIR, { recursive: true }, next);
                 });
             });
         }
diff --git a/migrations/20210503182308-blobs-migrate-secrets.js b/migrations/20210503182308-blobs-migrate-secrets.js
index 64dcdb399..3ec5e4378 100644
--- a/migrations/20210503182308-blobs-migrate-secrets.js
+++ b/migrations/20210503182308-blobs-migrate-secrets.js
@@ -13,7 +13,7 @@ exports.up = function (db, callback) {
     const acmeKey = safe.fs.readFileSync(`${BOX_DATA_DIR}/acme/acme.key`);
     if (acmeKey) {
         funcs.push(db.runSql.bind(db, 'INSERT INTO blobs (id, value) VALUES (?, ?)', [ 'acme_account_key', acmeKey ]));
-        funcs.push(fs.rmdir.bind(fs, `${BOX_DATA_DIR}/acme`, { recursive: true }));
+        funcs.push(fs.rm.bind(fs, `${BOX_DATA_DIR}/acme`, { recursive: true }));
     }
     const dhparams = safe.fs.readFileSync(`${BOX_DATA_DIR}/dhparams.pem`);
     if (dhparams) {
@@ -38,7 +38,7 @@ exports.up = function (db, callback) {
         safe.fs.chmodSync(`${PLATFORM_DATA_DIR}/sftp/ssh/ssh_host_rsa_key`, 0o600);
         funcs.push(db.runSql.bind(db, 'INSERT INTO blobs (id, value) VALUES (?, ?)', [ 'sftp_public_key', sftpPublicKey ]));
         funcs.push(db.runSql.bind(db, 'INSERT INTO blobs (id, value) VALUES (?, ?)', [ 'sftp_private_key', sftpPrivateKey ]));
-        funcs.push(fs.rmdir.bind(fs, `${BOX_DATA_DIR}/sftp`, { recursive: true }));
+        funcs.push(fs.rm.bind(fs, `${BOX_DATA_DIR}/sftp`, { recursive: true }));
     }
 
     async.series(funcs, callback);
diff --git a/migrations/20210504221634-settings-migrate-firewall.js b/migrations/20210504221634-settings-migrate-firewall.js
index 7ded8fb2a..be4e14849 100644
--- a/migrations/20210504221634-settings-migrate-firewall.js
+++ b/migrations/20210504221634-settings-migrate-firewall.js
@@ -22,7 +22,7 @@ exports.up = function (db, callback) {
             db.runSql('INSERT INTO settings (name, valueBlob) VALUES (?, ?)', [ 'firewall_blocklist', blocklist ], next);
         },
         fs.writeFile.bind(fs, `${PLATFORM_DATA_DIR}/firewall/blocklist.txt`, blocklist || ''),
-        fs.rmdir.bind(fs, `${BOX_DATA_DIR}/firewall`, { recursive: true })
+        fs.rm.bind(fs, `${BOX_DATA_DIR}/firewall`, { recursive: true })
     ], callback);
 };
 
diff --git a/migrations/20210505223829-blobs-migrate-certs.js b/migrations/20210505223829-blobs-migrate-certs.js
index 243fca62e..ce8445940 100644
--- a/migrations/20210505223829-blobs-migrate-certs.js
+++ b/migrations/20210505223829-blobs-migrate-certs.js
@@ -41,7 +41,7 @@ exports.up = function(db, callback) {
             if (error) return callback(error);
 
             child_process.execSync(`cp ${OLD_CERTS_DIR}/* ${NEW_CERTS_DIR}`); // this way we copy the non-migrated ones like .host, .user etc as well
-            fs.rmdir(OLD_CERTS_DIR, { recursive: true }, callback);
+            fs.rm(OLD_CERTS_DIR, { recursive: true }, callback);
         });
     });
 };
diff --git a/migrations/20211012020255-mail-add-dkimKeyJson.js b/migrations/20211012020255-mail-add-dkimKeyJson.js
index fadc484ad..e82edc263 100644
--- a/migrations/20211012020255-mail-add-dkimKeyJson.js
+++ b/migrations/20211012020255-mail-add-dkimKeyJson.js
@@ -31,7 +31,7 @@ exports.up = function(db, callback) {
             }, function (error) {
                 if (error) return callback(error);
 
-                fs.rmdir(DKIM_DIR, { recursive: true }, callback);
+                fs.rm(DKIM_DIR, { recursive: true }, callback);
             });
         });
     });
diff --git a/src/backuptargets.js b/src/backuptargets.js
index 2af2c31b7..fb25cff74 100644
--- a/src/backuptargets.js
+++ b/src/backuptargets.js
@@ -335,7 +335,7 @@ async function del(backupTarget, auditSource) {
     await cron.handleBackupScheduleChanged(backupTarget);
 
     const infoDir = path.join(paths.BACKUP_INFO_DIR, backupTarget.id);
-    safe.fs.rmdirSync(infoDir, { recursive: true });
+    safe.fs.rmSync(infoDir, { recursive: true });
 }
 
 async function startBackupTask(target, auditSource) {
diff --git a/src/storage/filesystem.js b/src/storage/filesystem.js
index cc925477d..cd15183be 100644
--- a/src/storage/filesystem.js
+++ b/src/storage/filesystem.js
@@ -225,7 +225,7 @@ async function remove(config, remotePath) {
     if (stat.isFile()) {
         if (!safe.fs.unlinkSync(fullRemotePath)) throw new BoxError(BoxError.EXTERNAL_ERROR, safe.error.message);
     } else if (stat.isDirectory()) {
-        if (!safe.fs.rmdirSync(fullRemotePath, { recursive: false })) throw new BoxError(BoxError.EXTERNAL_ERROR, safe.error.message);
+        if (!safe.fs.rmdirSync(fullRemotePath)) throw new BoxError(BoxError.EXTERNAL_ERROR, safe.error.message);
     }
 }