diff --git a/lib/commands/admin-rpc.js b/lib/commands/admin-rpc.js
index a7cbaacc1..c3c6cb0b6 100644
--- a/lib/commands/admin-rpc.js
+++ b/lib/commands/admin-rpc.js
@@ -180,7 +180,7 @@ var archiveDocument = function (Env, Server, cb, data) {
                     status: err? String(err): "SUCCESS",
                 });
                 Channel.disconnectChannelMembers(Env, Server, id, 'EDELETED', err => {
-                    if (err) { } // XXX
+                    if (err) { } // TODO
                 });
             }));
         case 48:
@@ -395,7 +395,7 @@ var getPinActivity = function (Env, Server, cb, data) {
     });
 };
 
-var isUserOnline = function (Env, Server, cb, data) { // XXX is there a better way to do this? with Env.Sessions?
+var isUserOnline = function (Env, Server, cb, data) {
     var key = Array.isArray(data) && data[1];
     if (!isValidKey(key)) { return void cb("EINVAL"); }
     key = Util.unescapeKeyCharacters(key);
@@ -551,7 +551,7 @@ var archiveBlock = function (Env, Server, cb, data) {
     var reason = args.reason;
     if (!isValidKey(key)) { return void cb("EINVAL"); }
     BlockStore.archive(Env, key, err => {
-        Env.Log.debug("ARCHIVE_BLOCK_BY_ADMIN", { // XXX
+        Env.Log.info("ARCHIVE_BLOCK_BY_ADMIN", {
             error: err,
             key: key,
             reason: reason || '',
@@ -567,7 +567,7 @@ var restoreArchivedBlock = function (Env, Server, cb, data) {
     var reason = args.reason;
     if (!isValidKey(key)) { return void cb("EINVAL"); }
     BlockStore.restore(Env, key, err => {
-        Env.Log.debug("RESTORE_ARCHIVED_BLOCK_BY_ADMIN", { // XXX
+        Env.Log.info("RESTORE_ARCHIVED_BLOCK_BY_ADMIN", {
             error: err,
             key: key,
             reason: reason || '',
diff --git a/lib/commands/channel.js b/lib/commands/channel.js
index e21e6493c..3be34c367 100644
--- a/lib/commands/channel.js
+++ b/lib/commands/channel.js
@@ -11,7 +11,6 @@ Channel.disconnectChannelMembers = function (Env, Server, channelId, code, cb) {
     var done = Util.once(Util.mkAsync(cb));
     if (!Core.isValidId(channelId)) { return done('INVALID_ID'); }
 
-    // XXX is valid channel?
     const channel_cache = Env.channel_cache;
     const metadata_cache = Env.metadata_cache;
 
@@ -142,9 +141,7 @@ var archiveOwnedChannel = function (Env, safeKey, channelId, __cb, Server) {
             cb(void 0, 'OK');
 
             Channel.disconnectChannelMembers(Env, Server, channelId, 'EDELETED', err => {
-                if (err) {
-                    // XXX
-                }
+                if (err) { } // TODO
             });
         });
     });