Removed unneeded TODO:s.