* Cleaned ups adn Fixed Gateways (TODO: gateway deletion)