Remove todo comments which have been fixed