Cleaned up code. Removed unsupported gateways and unused code.