diff --git a/builder b/builder
index c0eb9451d..8eef2e335 100755
--- a/builder
+++ b/builder
@@ -36,7 +36,6 @@ case $1 in
 		go build -v -o ../build/dns-proxy-server \
 			-ldflags "-X github.com/mageddo/dns-proxy-server/flags.version=$VERSION" && \
 		cp -r ../static ../build/ && \
-		cp ../dns-proxy-service ../build/dns-proxy-service && \
 		cd ../build/ && \
 		tar -cvf dns-proxy-server-$VERSION.tgz * && \
 		cd ../
diff --git a/dns-proxy-service b/dns-proxy-service
deleted file mode 100755
index 3e95c4724..000000000
--- a/dns-proxy-service
+++ /dev/null
@@ -1,67 +0,0 @@
-#!/bin/sh
-### BEGIN INIT INFO
-# Provides:          dns-proxy-server
-# Required-Start:    $local_fs $network $named $time $syslog
-# Required-Stop:     $local_fs $network $named $time $syslog
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-# Description:       DNS PROXY SERVER
-### END INIT INFO
-
-SCRIPT=<SCRIPT>
-RUNAS=root
-
-PIDFILE=/var/run/dns-proxy-server.pid
-LOGFILE=/var/log/dns-proxy-server.log
-
-start() {
-  if [ -f /var/run/$PIDNAME ] && kill -0 $(cat /var/run/$PIDNAME); then
-    echo 'Service already running' >&2
-    return 1
-  fi
-  echo 'Starting service…' >&2
-  local CMD="$SCRIPT &> \"$LOGFILE\" & echo \$!"
-  su -c "$CMD" $RUNAS > "$PIDFILE"
-  echo 'Service started' >&2
-}
-
-stop() {
-  if [ ! -f "$PIDFILE" ] || ! kill -0 $(cat "$PIDFILE"); then
-    echo 'Service not running' >&2
-    return 1
-  fi
-  echo 'Stopping service…' >&2
-  kill -15 $(cat "$PIDFILE") && rm -f "$PIDFILE"
-  echo 'Service stopped' >&2
-}
-
-uninstall() {
-  echo -n "Are you really sure you want to uninstall this service? That cannot be undone. [yes|No] "
-  local SURE
-  read SURE
-  if [ "$SURE" = "yes" ]; then
-    stop
-    rm -f "$PIDFILE"
-    echo "Notice: log file is not be removed: '$LOGFILE'" >&2
-    update-rc.d -f dns-proxy-server remove
-    rm -fv "$0"
-  fi
-}
-
-case "$1" in
-  start)
-    start
-    ;;
-  stop)
-    stop
-    ;;
-  uninstall)
-    uninstall
-    ;;
-  retart)
-    stop
-    start
-    ;;
-  *)
-    echo "Usage: $0 {start|stop|restart|uninstall}"
-esac
diff --git a/src/github.com/mageddo/dns-proxy-server/conf/conf.go b/src/github.com/mageddo/dns-proxy-server/conf/conf.go
index 882fccab3..bb0be18b6 100644
--- a/src/github.com/mageddo/dns-proxy-server/conf/conf.go
+++ b/src/github.com/mageddo/dns-proxy-server/conf/conf.go
@@ -174,7 +174,7 @@ func SetCurrentDNSServerToMachineAndLockIt() error {
 func SetCurrentDNSServerToMachine() error {
 
 	ip, err := getCurrentIpAddress()
-	log.Logger.Infof("m=SetCurrentDNSServerToMachine, status=begin, ip=%s, err=%s", ip, err)
+	log.Logger.Infof("m=SetCurrentDNSServerToMachine, status=begin, ip=%s, err=%v", ip, err)
 	if err != nil {
 		return err
 	}
diff --git a/src/github.com/mageddo/dns-proxy-server/service/service.go b/src/github.com/mageddo/dns-proxy-server/service/service.go
index a90081b14..17bb8b60b 100644
--- a/src/github.com/mageddo/dns-proxy-server/service/service.go
+++ b/src/github.com/mageddo/dns-proxy-server/service/service.go
@@ -31,7 +31,9 @@ func NewService(ctx context.Context) *Service {
 func (sc *Service) Install() {
 
 	setupServiceFlag := *flags.SetupService
-
+	if len(setupServiceFlag) == 0 {
+		return
+	}
 	sc.logger.Infof("setupservice=%s, version=%s", setupServiceFlag, flags.GetRawCurrentVersion())
 	var err error
 	switch setupServiceFlag {
@@ -80,13 +82,13 @@ func (sc *Service) SetupFor(servicePath, serviceName string, script *Script) err
 	if err != nil {
 		sc.logger.Debugf("status=stop-service, msg=out=%s", string(out))
 	}
-	out, err, code := utils.Exec("service", serviceName, "start")
+	_, err, _ = utils.Exec("service", serviceName, "start")
 	if err != nil {
 		err := fmt.Sprintf("status=start-service, msg=%v", err)
 		sc.logger.Warning(err)
 		return errors.New(err)
 	}
-	sc.logger.Infof("status=success, servicePath=%s, out=%s, err=%v, code=%d", servicePath, string(out), err, code)
+	sc.logger.Infof("status=success, servicePath=%s", servicePath)
 	return nil
 
 }
diff --git a/src/github.com/mageddo/dns-proxy-server/service/service_test.go b/src/github.com/mageddo/dns-proxy-server/service/service_test.go
index a57905f65..acea4b676 100644
--- a/src/github.com/mageddo/dns-proxy-server/service/service_test.go
+++ b/src/github.com/mageddo/dns-proxy-server/service/service_test.go
@@ -23,9 +23,7 @@ func TestSetupFor_NormalModeInstallStartSuccess(t *testing.T) {
 	sc := NewService(ctx)
 	cmd := "'bash -c \"echo hi && sleep 20\"'"
 	err := sc.SetupFor(DNS_PROXY_SERVER_PATH, DNS_PROXY_SERVER_SERVICE, &Script{cmd})
-	if err != nil {
-		t.Error(err)
-	}
+	assert.Nil(t, err)
 
 	bytes, err := ioutil.ReadFile(DNS_PROXY_SERVER_PATH)
 	assert.Nil(t, err)