diff --git a/src/freedombone-mesh-bmx6 b/src/freedombone-mesh-bmx6
index 97244df3..7ff919c4 100755
--- a/src/freedombone-mesh-bmx6
+++ b/src/freedombone-mesh-bmx6
@@ -38,6 +38,7 @@ source /usr/share/${PROJECT_NAME}/utils/${PROJECT_NAME}-utils-wifi
 source /usr/share/${PROJECT_NAME}/utils/${PROJECT_NAME}-utils-mesh
 
 mesh_protocol_init
+
 update_wifi_adaptors
 
 if [ ! $IFACE ]; then
@@ -68,8 +69,6 @@ function stop {
         fi
     fi
 
-    avahi-autoipd -k $BRIDGE
-    avahi-autoipd -k $IFACE
     ifconfig $IFACE down -promisc
 
     ifconfig $IFACE mtu 1500
@@ -124,6 +123,7 @@ function add_wifi_interface {
     echo $"$ifname assigned MAC address $peermac"
     iwconfig $ifname enc off
     iwconfig $ifname mode $ifmode essid $ifssid channel $ifchannel
+    #iwconfig wlan0 mode ad-hoc ap 02:ca:ff:ee:ba:be channel 11 essid my-mesh-network
 
     ifconfig $ifname up
 }
@@ -181,8 +181,6 @@ function start {
     systemctl enable bmx6
     systemctl start bmx6
 
-    avahi-autoipd --force-bind --daemonize --wait $IFACE
-
     # NOTE: Don't connect the secondary wifi device. hostapd will handle that by itself
 
     ethernet_connected='0'
diff --git a/src/freedombone-mesh-bmx7 b/src/freedombone-mesh-bmx7
index a7f9e69a..7d3cfc6f 100755
--- a/src/freedombone-mesh-bmx7
+++ b/src/freedombone-mesh-bmx7
@@ -68,8 +68,6 @@ function stop {
         fi
     fi
 
-    avahi-autoipd -k $BRIDGE
-    avahi-autoipd -k $IFACE
     ifconfig $IFACE down -promisc
 
     ifconfig $IFACE mtu 1500
@@ -181,8 +179,6 @@ function start {
     systemctl enable bmx7
     systemctl start bmx7
 
-    avahi-autoipd --force-bind --daemonize --wait $IFACE
-
     # NOTE: Don't connect the secondary wifi device. hostapd will handle that by itself
 
     ethernet_connected='0'