diff --git a/resin-run.sh b/resin-run.sh
index 82774b3..e4aec7f 100755
--- a/resin-run.sh
+++ b/resin-run.sh
@@ -62,7 +62,7 @@ fi
 
 if curl -sS --fail ipinfo.io --output ./ipinfo.json
 then
-	echo "Gateway Location:"
+	echo "Actual gateway location:"
 	IPINFO=$(cat ./ipinfo.json)
 	echo $IPINFO
 else
@@ -81,10 +81,6 @@ if [[ $GW_GHOSTSTREAM == "" ]]; then GW_GHOSTSTREAM="false"; fi
 if [[ $GW_RADIOSTREAM == "" ]]; then GW_RADIOSTREAM="true"; fi
 if [[ $GW_STATUSSTREAM == "" ]]; then GW_STATUSSTREAM="true"; fi
 
-if [[ $GW_SERVER_ADDRESS == "" ]]; then GW_SERVER_ADDRESS="\"127.0.0.1\""; fi
-if [[ $GW_SERV_PORT_UP == "" ]]; then GW_SERV_PORT_UP="1600"; fi
-if [[ $GW_SERV_PORT_DOWN == "" ]]; then GW_SERV_PORT_DOWN="1601"; fi
-
 if [[ $GW_KEEPALIVE_INTERVAL == "" ]]; then GW_KEEPALIVE_INTERVAL="10"; fi
 if [[ $GW_STAT_INTERVAL == "" ]]; then GW_STAT_INTERVAL="30"; fi
 if [[ $GW_PUSH_TIMEOUT_MS == "" ]]; then GW_PUSH_TIMEOUT_MS="100"; fi
@@ -114,9 +110,6 @@ if [[ $GW_SYSTEM_CALLS == "" ]]; then GW_SYSTEM_CALLS="[\"df -m\",\"free -h\",\"
 if [[ $GW_PLATFORM == "" ]]; then GW_PLATFORM="\"*\""; fi
 
 # create local.conf
-# \t\t\"server_address\": $GW_SERVER_ADDRESS,\n\
-# \t\t\"serv_port_up\": $GW_SERV_PORT_UP,\n\
-# \t\t\"serv_port_down\": $GW_SERV_PORT_DOWN,\n\
 
 echo -e "{\n\
 \t\"gateway_conf\": {\n\
diff --git a/resin-run.sh~ b/resin-run.sh~
index 2bc763f..82774b3 100755
--- a/resin-run.sh~
+++ b/resin-run.sh~
@@ -114,6 +114,9 @@ if [[ $GW_SYSTEM_CALLS == "" ]]; then GW_SYSTEM_CALLS="[\"df -m\",\"free -h\",\"
 if [[ $GW_PLATFORM == "" ]]; then GW_PLATFORM="\"*\""; fi
 
 # create local.conf
+# \t\t\"server_address\": $GW_SERVER_ADDRESS,\n\
+# \t\t\"serv_port_up\": $GW_SERV_PORT_UP,\n\
+# \t\t\"serv_port_down\": $GW_SERV_PORT_DOWN,\n\
 
 echo -e "{\n\
 \t\"gateway_conf\": {\n\
@@ -130,9 +133,6 @@ echo -e "{\n\
 \t\t\"ghoststream\": $GW_GHOSTSTREAM,\n\
 \t\t\"radiostream\": $GW_RADIOSTREAM,\n\
 \t\t\"statusstream\": $GW_STATUSSTREAM,\n\
-# \t\t\"server_address\": $GW_SERVER_ADDRESS,\n\
-# \t\t\"serv_port_up\": $GW_SERV_PORT_UP,\n\
-# \t\t\"serv_port_down\": $GW_SERV_PORT_DOWN,\n\
 \t\t\"keepalive_interval\": $GW_KEEPALIVE_INTERVAL,\n\
 \t\t\"stat_interval\": $GW_STAT_INTERVAL,\n\
 \t\t\"push_timeout_ms\": $GW_PUSH_TIMEOUT_MS,\n\