diff --git a/init/Makefile b/init/Makefile
index 199f4fac..90c5b0be 100644
--- a/init/Makefile
+++ b/init/Makefile
@@ -1,9 +1,7 @@
-# Install files and directories required by NetSender clients (such as gpio-netsender, rv, etc.)
-# and create a dhcpcd.enter-hook for setting the MAC address.
-# MA and DK can be optionally passed to Make, e.g, for a hard (first-time) installation:
-# 	sudo MA=mac DK=dk install_hard
-# NB: The default (soft) install does not override conf files.
-# USR can also be passsed to customise user under which the code is housed.
+# Install files and directories required by NetSender clients (such as gpio-netsender, rv, etc.).
+# Optionally you can create a dhcpcd.enter-hook for setting the MAC address. (install_set_mac).
+# MA and DK must be passed to Make for an installation:
+# 	sudo make install MA=mac DK=dk
 USER := $(shell whoami)
 PATH := /usr/local/go/bin:$(PATH)
 BIN_NAME := rv
@@ -13,36 +11,28 @@ RUN_SCRIPT_DIR := /src/bitbucket.org/ausocean/av/init/run.sh
 # Change this to withcv if you wish to use CV.
 BUILD_TAG :=
 
-ifeq ($(MA),)
-	MA := "00:E0:4C:00:00:01"
-endif
-ifeq ($(DK),)
-	DK := 0
-endif
-
 .SILENT:make_dirs
-.SILENT:soft_copy_files
 .SILENT:hard_copy_files
 .SILENT:set_mac
 .SILENT:clean
 
 rebuild:
-	chmod +x run.sh
-	cd ../cmd/$(BIN_NAME); \
+	@chmod +x run.sh
+	@cd ../cmd/$(BIN_NAME); \
 	if [ -z "$(BUILD_TAG)" ]; then \
 		go build; \
 	else \
 		go build -tags $(BUILD_TAG); \
 	fi
 
-install: as_root make_dirs soft_copy_files rebuild syncreboot
+install: as_root make_dirs hard_copy_files rebuild syncreboot
 	@echo "Install complete"
 
-install_hard: as_root make_dirs hard_copy_files set_mac rebuild syncreboot
-	@echo "Hard install complete"
+install_no_rebuild: as_root make_dirs hard_copy_files syncreboot
+	@echo "Install complete"
 
-install_hard_treat: as_root make_dirs hard_copy_files_treat set_mac syncreboot
-	@echo "Hard install complete"
+install_set_mac: as_root make_dirs hard_copy_files set_mac rebuild syncreboot
+	@echo "Install complete, MAC address set to $(MA)"
 
 as_root:
 ifneq ($(USER),root)
@@ -50,67 +40,48 @@ ifneq ($(USER),root)
 endif
 
 make_dirs:
-	if [ ! -d /var/netsender ] ; then \
+	@if [ ! -d /var/netsender ] ; then \
 		mkdir /var/netsender; \
 		chmod guo+rwx /var/netsender; \
 	fi
-	if [ ! -d /var/log/netsender ] ; then \
+	@if [ ! -d /var/log/netsender ] ; then \
 		mkdir /var/log/netsender; \
 		chmod guo+rwx /var/log/netsender; \
 	fi
 
-soft_copy_files:
-	if [ -f /etc/systemd/system/$(BIN_NAME).service ] ; then \
-		echo "/etc/systemd/system/$(BIN_NAME).service left unmodified" ; \
-	else \
-		bash create_service.sh $(RUN_SCRIPT_DIR) $(BIN_DIR); \
-	fi
-	systemctl enable $(BIN_NAME).service
-	if [ -f /etc/netsender.conf ] ; then \
-		echo "/etc/netsender.conf left unmodified" ; \
-	else \
-		printf "ma $(MA)\ndk $(DK)\n" > /etc/netsender.conf; \
-		bash permissions.sh; \
-	fi
-
 hard_copy_files:
+ifeq ($(MA),)
+	$(error "Must provide MAC using MA=")
+endif
+ifeq ($(DK),)
+	$(error "Must provide device key using DK=")
+endif
 	if [ -f /etc/systemd/system/$(BIN_NAME).service ] ; then \
 		echo "/etc/systemd/system/$(BIN_NAME).service overwritten" ; \
 	fi
 	bash create_service.sh $(RUN_SCRIPT_DIR) $(BIN_DIR)
-	systemctl enable $(BIN_NAME).service
-	if [ -f /etc/netsender.conf ] ; then \
+	@systemctl enable $(BIN_NAME).service
+	@if [ -f /etc/netsender.conf ] ; then \
 		echo "Backed up netsender.conf to /etc/netsender.conf.bak"; \
 		cp /etc/netsender.conf /etc/netsender.conf.bak ; \
 	fi
-	printf "ma $(MA)\ndk $(DK)\n" > /etc/netsender.conf
-	bash permissions.sh
-
-hard_copy_files_treat:
-	if [ -f /etc/systemd/system/treatment.service ] ; then \
-		echo "/etc/systemd/system/treatment.service overwritten" ; \
-	fi
-	cp -f treatment.service /etc/systemd/system
-	systemctl enable treatment.service
-	chmod +x treatment_run.sh
-	if [ -f /etc/netsender.conf ] ; then \
-		echo "Backed up netsender.conf to /etc/netsender.conf.bak"; \
-		cp /etc/netsender.conf /etc/netsender.conf.bak ; \
-	fi
-	printf "ma $(MA)\ndk $(DK)\n" > /etc/netsender.conf
+	@printf "ma $(MA)\ndk $(DK)\n" > /etc/netsender.conf
 	bash permissions.sh
 
 set_mac:
-	printf "ip link set eth0 address $(MA)\n" > /etc/dhcpcd.enter-hook
-	chmod guo+x /etc/dhcpcd.enter-hook
+ifeq ($(MA),)
+	$(error "Must provide MAC using MA=")
+endif
+	@printf "ip link set eth0 address $(MA)\n" > /etc/dhcpcd.enter-hook
+	@chmod guo+x /etc/dhcpcd.enter-hook
 
 syncreboot:
-	if [ -e ../../utils ]; then \
+	@if [ -e ../../utils ]; then \
 		cd ../../utils; git checkout -f master; git pull; \
 	else \
 		cd ../../; git clone https://bitbucket.org/ausocean/utils; \
 	fi
-	cd ../../utils/cmd/syncreboot; make; make install
+	@cd ../../utils/cmd/syncreboot; make; make install
 
 clean: as_root
 	rm -rf /var/netsender