[CHORE] Simplify by removing gateway_account.