removed deprecated gateway classes