Remove obsolete TODO after testing