diff --git a/lib/hk-util.js b/lib/hk-util.js
index 0fc196fe3..69832a544 100644
--- a/lib/hk-util.js
+++ b/lib/hk-util.js
@@ -44,7 +44,7 @@ const tryParse = function (Env, str) {
     try {
         return JSON.parse(str);
     } catch (err) {
-        Env.Log.error('HK_PARSE_ERROR', err); // XXX
+        Env.Log.error('HK_PARSE_ERROR', err);
     }
 };
 
diff --git a/lib/rpc.js b/lib/rpc.js
index 60b186563..1ade85d23 100644
--- a/lib/rpc.js
+++ b/lib/rpc.js
@@ -19,7 +19,7 @@ const Store = require("../storage/file");
 const BlobStore = require("../storage/blob");
 
 const UNAUTHENTICATED_CALLS = {
-    GET_FILE_SIZE: Pinning.getFileSize, // XXX TEST
+    GET_FILE_SIZE: Pinning.getFileSize,
     GET_MULTIPLE_FILE_SIZE: Pinning.getMultipleFileSize,
     GET_DELETED_PADS: Pinning.getDeletedPads,
     IS_CHANNEL_PINNED: Pinning.isChannelPinned,
diff --git a/scripts/tests/test-rpc.js b/scripts/tests/test-rpc.js
index f32a8ee60..07f30bc46 100644
--- a/scripts/tests/test-rpc.js
+++ b/scripts/tests/test-rpc.js
@@ -160,8 +160,8 @@ var createUser = function (config, cb) {
             wc.leave();
         }));
     }).nThen(function (w) {
-        // give the server time to write your mailbox data before checking that it's correct
-        // XXX chainpad-server sends an ACK before the channel has actually been created
+        // FIXME give the server time to write your mailbox data before checking that it's correct
+        // chainpad-server sends an ACK before the channel has actually been created
         // causing you to think that everything is good.
         // without this timeout the GET_METADATA rpc occasionally returns before
         // the metadata has actually been written to the disk.