diff --git a/src/scripts/elua/apps/docgen/doctree.lua b/src/scripts/elua/apps/docgen/doctree.lua
index bbc1e50da7..0a031d2656 100644
--- a/src/scripts/elua/apps/docgen/doctree.lua
+++ b/src/scripts/elua/apps/docgen/doctree.lua
@@ -294,7 +294,6 @@ M.Class = Node:clone {
         if ret then
             return ret
         end
-        -- FIXME: unit
         local v = eolian.class_get_by_name(eos:unit_get(), name)
         if not v then
             return nil
@@ -310,7 +309,6 @@ M.Class = Node:clone {
         if ret then
             return ret
         end
-        -- FIXME: unit
         local v = eolian.class_get_by_file(eos:unit_get(), name)
         if not v then
             return nil
@@ -323,7 +321,6 @@ M.Class = Node:clone {
     all_get = function()
         local ret, had = get_cache(M.Class, "_cache_all")
         if not had then
-            -- FIXME: unit
             for cl in eolian.all_classes_get(eos:unit_get()) do
                 ret[#ret + 1] = M.Class(cl)
             end
@@ -714,7 +711,6 @@ M.Type = Node:clone {
     end,
 
     class_get = function(self)
-        -- FIXME: unit
         return self.type:class_get(eos:unit_get())
     end,
 
@@ -894,7 +890,6 @@ M.Typedecl = Node:clone {
     end,
 
     c_type_get = function(self)
-        -- FIXME: unit
         return self.typedecl:c_type_get(eos:unit_get())
     end,
 
@@ -930,7 +925,6 @@ M.Typedecl = Node:clone {
 
     all_aliases_get = function()
         local ret = {}
-        -- FIXME: unit
         for tp in eolian.typedecl_all_aliases_get(eos:unit_get()) do
             ret[#ret + 1] = M.Typedecl(tp)
         end
@@ -939,7 +933,6 @@ M.Typedecl = Node:clone {
 
     all_structs_get = function()
         local ret = {}
-        -- FIXME: unit
         for tp in eolian.typedecl_all_structs_get(eos:unit_get()) do
             ret[#ret + 1] = M.Typedecl(tp)
         end
@@ -948,7 +941,6 @@ M.Typedecl = Node:clone {
 
     all_enums_get = function()
         local ret = {}
-        -- FIXME: unit
         for tp in eolian.typedecl_all_enums_get(eos:unit_get()) do
             ret[#ret + 1] = M.Typedecl(tp)
         end
@@ -957,7 +949,6 @@ M.Typedecl = Node:clone {
 
     aliases_by_file_get = function(fn)
         local ret = {}
-        -- FIXME: unit
         for tp in eolian.typedecl_aliases_get_by_file(eos:unit_get(), fn) do
             ret[#ret + 1] = M.Typedecl(tp)
         end
@@ -966,7 +957,6 @@ M.Typedecl = Node:clone {
 
     structs_by_file_get = function(fn)
         local ret = {}
-        -- FIXME: unit
         for tp in eolian.typedecl_structs_get_by_file(eos:unit_get(), fn) do
             ret[#ret + 1] = M.Typedecl(tp)
         end
@@ -975,7 +965,6 @@ M.Typedecl = Node:clone {
 
     enums_by_file_get = function(fn)
         local ret = {}
-        -- FIXME: unit
         for tp in eolian.typedecl_enums_get_by_file(eos:unit_get(), fn) do
             ret[#ret + 1] = M.Typedecl(tp)
         end
@@ -983,7 +972,6 @@ M.Typedecl = Node:clone {
     end,
 
     alias_by_name_get = function(tn)
-        -- FIXME: unit
         local v = eolian.typedecl_alias_get_by_name(eos:unit_get(), tn)
         if not v then
             return nil
@@ -992,7 +980,6 @@ M.Typedecl = Node:clone {
     end,
 
     struct_by_name_get = function(tn)
-        -- FIXME: unit
         local v = eolian.typedecl_struct_get_by_name(eos:unit_get(), tn)
         if not v then
             return nil
@@ -1001,7 +988,6 @@ M.Typedecl = Node:clone {
     end,
 
     enum_by_name_get = function(tn)
-        -- FIXME: unit
         local v = eolian.typedecl_enum_get_by_name(eos:unit_get(), tn)
         if not v then
             return nil
@@ -1284,7 +1270,6 @@ M.Variable = Node:clone {
 
     all_globals_get = function()
         local ret = {}
-        -- FIXME: unit
         for v in eolian.variable_all_globals_get(eos:unit_get()) do
             ret[#ret + 1] = M.Variable(v)
         end
@@ -1293,7 +1278,6 @@ M.Variable = Node:clone {
 
     all_constants_get = function()
         local ret = {}
-        -- FIXME: unit
         for v in eolian.variable_all_constants_get(eos:unit_get()) do
             ret[#ret + 1] = M.Variable(v)
         end
@@ -1302,7 +1286,6 @@ M.Variable = Node:clone {
 
     globals_by_file_get = function(fn)
         local ret = {}
-        -- FIXME: unit
         for v in eolian.variable_globals_get_by_file(eos:unit_get(), fn) do
             ret[#ret + 1] = M.Variable(v)
         end
@@ -1311,7 +1294,6 @@ M.Variable = Node:clone {
 
     constants_by_file_get = function(fn)
         local ret = {}
-        -- FIXME: unit
         for v in eolian.variable_constants_get_by_file(eos:unit_get(), fn) do
             ret[#ret + 1] = M.Variable(v)
         end
@@ -1319,7 +1301,6 @@ M.Variable = Node:clone {
     end,
 
     global_by_name_get = function(vn)
-        -- FIXME: unit
         local v = eolian.variable_global_get_by_name(eos:unit_get(), vn)
         if not v then
             return nil
@@ -1328,7 +1309,6 @@ M.Variable = Node:clone {
     end,
 
     constant_by_name_get = function(vn)
-        -- FIXME: unit
         local v = eolian.variable_constant_get_by_name(eos:unit_get(), vn)
         if not v then
             return nil
@@ -1344,12 +1324,10 @@ M.Expression = Node:clone {
     end,
 
     eval_enum = function(self)
-        -- FIXME: unit
         return self.expr:eval(eos:unit_get(), eolian.expression_mask.INT)
     end,
 
     eval_type = function(self, tp)
-        -- FIXME: unit
         return self.expr:eval_type(eos:unit_get(), tp.type)
     end,
 
@@ -1460,7 +1438,6 @@ M.DocTokenizer = Node:clone {
     end,
 
     ref_get = function(self, root)
-        -- FIXME: unit
         local tp, d1, d2 = self.tok:ref_get(eos:unit_get())
         local reft = eolian.doc_ref_type
         local ret
@@ -1525,7 +1502,7 @@ M.parse = function(st)
             error("failed parsing eo files")
         end
     end
-    -- build reverse inheritance hierarchy, FIXME: unit
+    -- build reverse inheritance hierarchy
     for cl in eolian.all_classes_get(eos:unit_get()) do
         local cln = cl:full_name_get()
         for icl in cl:inherits_get() do