Removing obsolete TODO