Removed unneeded TODO markers.