Delete TODO, it has been implemented