Distance measure gateway removal