Removed TODO message, since the TODO was done.