Removed TODO that has been done.