Removing obsolete endpoints