diff --git a/Makefile b/Makefile
index 16dad41..9819033 100644
--- a/Makefile
+++ b/Makefile
@@ -8,8 +8,7 @@ all:
 
 install:
 	mkdir -p -m 0755 ${DESTDIR}${SYSTEMDSYSTEMDIR}
-	install -m 0644 mxstartup-mxvip.service    ${DESTDIR}${SYSTEMDSYSTEMDIR}
-	install -m 0644 mxstartup-classic.service  ${DESTDIR}${SYSTEMDSYSTEMDIR}
+	install -m 0644 mxstartup.service  ${DESTDIR}${SYSTEMDSYSTEMDIR}
 	mkdir -p -m 0755 ${DESTDIR}${SBINDIR}
 	install -m 0755 mxstartup2mxconfig         ${DESTDIR}${SBINDIR}
 	install -m 0755 mxvipctl                   ${DESTDIR}${SBINDIR}
diff --git a/mxservicectl b/mxservicectl
index 49dacd9..7b7fee3 100755
--- a/mxservicectl
+++ b/mxservicectl
@@ -21,7 +21,7 @@ function mxsrv_start_one() {
 
    case "${MX_SRV_SCRIPT}" in
        *.service)
-           systemctl start "${MX_SRV_SCRIPT}"
+           systemctl start "${MX_SRV_SCRIPT}" || true
            ;;
        *)
            su - ${MX_SRV_USER} -c "${MX_SRV_SCRIPT} start" &
@@ -43,7 +43,7 @@ function mxsrv_stop_one() {
 
    case "${MX_SRV_SCRIPT}" in
        *.service)
-           systemctl stop "${MX_SRV_SCRIPT}"
+           systemctl stop "${MX_SRV_SCRIPT}" || true
            ;;
        *)
            su - ${MX_SRV_USER} -c "${MX_SRV_SCRIPT} stop" &
diff --git a/mxstartup-mxvip.service b/mxstartup-mxvip.service
deleted file mode 100644
index 0ccd23e..0000000
--- a/mxstartup-mxvip.service
+++ /dev/null
@@ -1,15 +0,0 @@
-[Unit]
-Description=Mariux Virtual IP and Forwarding
-ConditionPathExists=/etc/mxstartups
-Requires=network.target mxmount.service
-After=network.target mxmount.service
-
-[Service]
-Type=oneshot
-ExecStart=/usr/sbin/mxvipctl start
-ExecStop=/usr/sbin/mxvipctl stop
-RemainAfterExit=yes
-StandardOutput=syslog
-
-[Install]
-WantedBy=multi-user.target
diff --git a/mxstartup-classic.service b/mxstartup.service
similarity index 67%
rename from mxstartup-classic.service
rename to mxstartup.service
index 827854d..65d67f6 100644
--- a/mxstartup-classic.service
+++ b/mxstartup.service
@@ -1,7 +1,7 @@
 [Unit]
 Description=Mariux mxstartup classic
-After=mxstartup-mxvip.service mxmount.service nis.service
-Requires=mxstartup-mxvip.service mxmount.service
+After=mxmount.service nis.service
+Requires=mxmount.service
 
 [Service]
 Type=oneshot