diff --git a/src/Context.cpp b/src/Context.cpp
index d9dafe095..c89340e19 100644
--- a/src/Context.cpp
+++ b/src/Context.cpp
@@ -148,23 +148,17 @@ int Context::initialize (int argc, const char** argv)
 
     ////////////////////////////////////////////////////////////////////////////
     //
-    // [3] Instantiate Command objects and capture entities.
+    // [3] Instantiate Command objects and capture command entities.
     //
     ////////////////////////////////////////////////////////////////////////////
 
     Command::factory (commands);
     for (auto& cmd : commands)
-    {
       cli2.entity ("cmd", cmd.first);
-      cli2.entity ((cmd.second->read_only () ? "readcmd" : "writecmd"), cmd.first);
-
-      if (cmd.first[0] == '_')
-        cli2.entity ("helper", cmd.first);
-    }
 
     ////////////////////////////////////////////////////////////////////////////
     //
-    // [4] Instantiate Column objects and capture entities.
+    // [4] Instantiate Column objects and capture column entities.
     //
     ////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/Filter.cpp b/src/Filter.cpp
index a9222dfc3..6e93d43a8 100644
--- a/src/Filter.cpp
+++ b/src/Filter.cpp
@@ -278,7 +278,7 @@ bool Filter::pendingOnly ()
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-// Disaster avoidance mechanism. If a WRITECMD has no filter, then it can cause
+// Disaster avoidance mechanism. If a !READONLY has no filter, then it can cause
 // all tasks to be modified. This is usually not intended.
 void Filter::safety ()
 {