rm TODO comment as it has been done...