removed references to new gateways