Removed defaults for gateway