Remove deprecated gateways

Closes #5422