Delete dnsmasq setup, refactor app deployment for master setup