Removed TODO as it is done.