Removes duplicated code. Updates #cleanup Signed-off-by: Maisem Ali <maisem@tailscale.com>
Updates #8658 Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>