More gateway removal