Removed some done @todo comments.