diff --git a/Makefile b/Makefile
index 133d4c1..3ccfaf7 100644
--- a/Makefile
+++ b/Makefile
@@ -21,7 +21,7 @@ install:
 
 uninstall:
 	$(PIP) uninstall -y naxalnet
-	rm -rf /usr/share/naxalnet /usr/lib/systemd/system/naxalnet.service /usr/lib/systemd/system/iwd.service.d/naxalnet.conf
+	rm -rf /usr/share/naxalnet /usr/lib/systemd/system/naxalnet.service
 	@echo "make uninstall will not remove anything in /etc/naxalnet" && \
 	echo "Do 'sudo make purge' to remove it."
 
diff --git a/naxalnet/__init__.py b/naxalnet/__init__.py
index f51215a..7bd9dda 100644
--- a/naxalnet/__init__.py
+++ b/naxalnet/__init__.py
@@ -42,4 +42,4 @@ given below.
 #
 # In case you forgot to change the version, skip the number
 # and put the next number in the next commit.
-__version__ = "0.5.0a1.dev4"
+__version__ = "0.5.0a1.dev5"
diff --git a/service/iwd.service.d/naxalnet.conf b/service/iwd.service.d/naxalnet.conf
deleted file mode 100644
index bc72d66..0000000
--- a/service/iwd.service.d/naxalnet.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-[Unit]
-# Fix for issue #21
-Conflicts=wpa_supplicant.service
-After=wpa_supplicant.service
diff --git a/service/naxalnet.service b/service/naxalnet.service
index 1e04540..f8969e2 100644
--- a/service/naxalnet.service
+++ b/service/naxalnet.service
@@ -4,19 +4,15 @@
 [Unit]
 Description=Setup mesh networks
 Requires=systemd-networkd.service
-# See issue #21 to find out why we do not use Required for iwd
-Wants=iwd.service
+Requires=iwd.service
 Wants=systemd-resolved.service
 After=iwd.service
 After=systemd-networkd.service
 After=systemd-resolved.service
-# Stops NetworkManager and wpa_supplicant if already running
+# Stops NetworkManager if already running
 Conflicts=NetworkManager.service
-# Commented out for testing
-#Conflicts=wpa_supplicant.service
 # This stops networkmanager and wpa_supplicant when naxalnet is enabled
 After=NetworkManager.service
-#After=wpa_supplicant.service
 
 [Service]
 Type=notify
diff --git a/service/wpa_supplicant.service.d/naxalnet.conf b/service/wpa_supplicant.service.d/naxalnet.conf
deleted file mode 100644
index 44faf9c..0000000
--- a/service/wpa_supplicant.service.d/naxalnet.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-[Service]
-# Fix for #21
-ExecStartPost=systemctl try-restart naxalnet.service
diff --git a/setup.cfg b/setup.cfg
index 56b3dce..67829aa 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -34,10 +34,6 @@ console_scripts =
 [options.data_files]
 lib/systemd/system =
     service/naxalnet.service
-lib/systemd/system/iwd.service.d =
-    service/iwd.service.d/naxalnet.conf
-lib/systemd/system/wpa_supplicant.service.d =
-    service/wpa_supplicant.service.d/naxalnet.conf
 # If installing with pip, this file will be copied to some other place.
 # This is the reason we use setup.py instead of pip in the Makefile.
 /etc/naxalnet =