Remove TODO note, as it has been done