Gateway removal