Remove the TODO perhaps?