MANATEE-188 remove unnecessary TODO