ENTESB-1185 - Remove TODO from modules that are in kit