CLC-1916 Remove a resolved TODO