diff --git a/lib/commands/admin-rpc.js b/lib/commands/admin-rpc.js
index ae7dcc45f..72176f3a0 100644
--- a/lib/commands/admin-rpc.js
+++ b/lib/commands/admin-rpc.js
@@ -116,13 +116,6 @@ var getRegisteredUsers = Admin.getRegisteredUsers = function (Env, Server, cb) {
                 }
                 folders = list;
             }));
-            Fs.readdir(dirB, waitFor(function (err, list) {
-                if (err) {
-                    waitFor.abort();
-                    return void done(err);
-                }
-                foldersB = list;
-            }));
         }).nThen(function (waitFor) {
             folders.forEach(function (f) {
                 var dir = Env.paths.pin + '/' + f;
@@ -135,20 +128,8 @@ var getRegisteredUsers = Admin.getRegisteredUsers = function (Env, Server, cb) {
                     users += list.length;
                 }));
             });
-        }).nThen(function (waitFor) {
-            foldersB.forEach(function (f) {
-                var dir = Env.paths.block + '/' + f;
-                Fs.readdir(dir, waitFor(function (err, list) {
-                    if (err) { return; }
-                    // Don't count placeholders
-                    list = list.filter(name => {
-                        return !/\.placeholder$/.test(name);
-                    });
-                    blocks += list.length;
-                }));
-            });
         }).nThen(function () {
-            done(void 0, {users, blocks});
+            done(void 0, {users});
         });
     });
 };
diff --git a/lib/commands/quota.js b/lib/commands/quota.js
index 2397b7680..6fb33bee3 100644
--- a/lib/commands/quota.js
+++ b/lib/commands/quota.js
@@ -161,13 +161,11 @@ var queryAccountServer = function (Env, cb) {
         nThen(waitFor => {
             Admin.getRegisteredUsers(Env, null, waitFor((err, data) => {
                 if (err) { return; }
-                stats.registered = data.blocks;
+                stats.registered = data.users;
                 if (Env.lastPingRegisteredUsers) {
                     stats.usersDiff = stats.registered - Env.lastPingRegisteredUsers;
                 }
                 Env.lastPingRegisteredUsers = stats.registered;
-                let teams = (data.users - data.blocks);
-                if (teams > 0) { stats.teams = teams; }
             }));
         }).nThen(() => {
             if (Env.maxConcurrentWs) {
diff --git a/www/admin/inner.js b/www/admin/inner.js
index d513ab0b1..3ca4f173f 100644
--- a/www/admin/inner.js
+++ b/www/admin/inner.js
@@ -2713,8 +2713,7 @@ define([
                 }, function (e, arr) {
                     pre.innerText = '';
                     let data = arr[0];
-                    pre.append(String(data.blocks));
-                    pre.append(' (old value including teams: ' + String(data.users) + ')'); // XXX
+                    pre.append(String(data.users));
                 });
             };
             onRefresh();