TODO comment removed