diff --git a/nfs-blkmap.service b/nfs-blkmap.service
deleted file mode 100644
index c026492..0000000
--- a/nfs-blkmap.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=pNFS block layout mapping daemon
-Wants=var-lib-nfs-rpc_pipefs.mount
-Requires=var-lib-nfs-rpc_pipefs.mount
-
-[Service]
-Type=forking
-StandardError=syslog+console
-EnvironmentFile=-/etc/sysconfig/nfs
-ExecStart=/usr/sbin/blkmapd $BLKMAPDARGS
-
-[Install]
-WantedBy=nfs.target
diff --git a/nfs-idmap.service b/nfs-idmap.service
deleted file mode 100644
index 872ae09..0000000
--- a/nfs-idmap.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=NFSv4 ID-name mapping daemon
-BindTo=nfs-server.service
-After=nfs-server.service
-
-[Service]
-Type=forking
-StandardError=syslog+console
-EnvironmentFile=-/etc/sysconfig/nfs
-ExecStart=/usr/sbin/rpc.idmapd $RPCIDMAPDARGS
-
-[Install]
-WantedBy=nfs.target
diff --git a/nfs-lock.service b/nfs-lock.service
deleted file mode 100644
index f9bb3e5..0000000
--- a/nfs-lock.service
+++ /dev/null
@@ -1,14 +0,0 @@
-[Unit]
-Description=NFS file locking service.
-Requires=rpcbind.service network.target
-After=network.target named.service rpcbind.service
-Before=remote-fs-pre.target
-
-[Service]
-Type=forking
-StandardError=syslog+console
-EnvironmentFile=-/etc/sysconfig/nfs
-ExecStart=/sbin/rpc.statd $STATDARG
-
-[Install]
-WantedBy=nfs.target
diff --git a/nfs-mountd.service b/nfs-mountd.service
deleted file mode 100644
index 430060a..0000000
--- a/nfs-mountd.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=NFS Mount Daemon
-BindTo=nfs-server.service
-After=nfs-server.service
-
-[Service]
-Type=forking
-EnvironmentFile=-/etc/sysconfig/nfs
-ExecStart=/usr/sbin/rpc.mountd $RPCMOUNTDOPTS
-StandardError=syslog+console
-
-[Install]
-WantedBy=nfs.target
diff --git a/nfs-rquotad.service b/nfs-rquotad.service
deleted file mode 100644
index c305aaa..0000000
--- a/nfs-rquotad.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=NFS Remote Quota Server
-BindTo=nfs-server.service
-After=nfs-server.service
-
-[Service]
-Type=forking
-StandardError=syslog+console
-EnvironmentFile=-/etc/sysconfig/nfs
-ExecStart=-/usr/sbin/rpc.rquotad $RPCRQUOTADOPTS
-
-[Install]
-WantedBy=nfs.target
diff --git a/nfs-secure-server.service b/nfs-secure-server.service
deleted file mode 100644
index 1b9c0f4..0000000
--- a/nfs-secure-server.service
+++ /dev/null
@@ -1,14 +0,0 @@
-[Unit]
-Description=Secure NFS Server
-Requires=var-lib-nfs-rpc_pipefs.mount nfs-server.service
-After=syslog.target var-lib-nfs-rpc_pipefs.mount nfs-server.service 
-
-[Service]
-Type=forking
-StandardError=syslog+console
-EnvironmentFile=-/etc/sysconfig/nfs
-ExecStart=/usr/sbin/rpc.svcgssd $RPCSVCGSSDARGS
-
-[Install]
-WantedBy=nfs.target
-
diff --git a/nfs-secure.service b/nfs-secure.service
deleted file mode 100644
index 32a33ea..0000000
--- a/nfs-secure.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=Secure NFS
-Requires=var-lib-nfs-rpc_pipefs.mount
-After=syslog.target var-lib-nfs-rpc_pipefs.mount
-
-[Service]
-Type=forking
-StandardError=syslog+console
-EnvironmentFile=-/etc/sysconfig/nfs
-ExecStart=/usr/sbin/rpc.gssd $RPCGSSDARGS
-
-[Install]
-WantedBy=nfs.target
diff --git a/nfs-server.postconfig b/nfs-server.postconfig
deleted file mode 100644
index 6ff8a59..0000000
--- a/nfs-server.postconfig
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-
-. /etc/sysconfig/nfs
-
-#
-# Enabled the RDMA server support if configured to do so.
-# 
-# Load the module and  then enable the server to listen 
-# on the given port
-if [ -n "$RDMA_PORT" ]; then 
-	/sbin/modprobe svcrdma
-	echo "rdma $RDMA_PORT" > /proc/fs/nfsd/portlist
-fi
-
-exit 0
diff --git a/nfs-server.preconfig b/nfs-server.preconfig
deleted file mode 100644
index d965dbe..0000000
--- a/nfs-server.preconfig
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-. /etc/sysconfig/nfs
-
-# Set v4 grace period if requested
-if [ -n "$NFSD_V4_GRACE" ]; then
-	echo "$NFSD_V4_GRACE" > /proc/fs/nfsd/nfsv4gracetime
-fi
-
-exit 0
diff --git a/nfs-server.service b/nfs-server.service
deleted file mode 100644
index 8d05584..0000000
--- a/nfs-server.service
+++ /dev/null
@@ -1,23 +0,0 @@
-[Unit]
-Description=NFS Server
-Requires=proc-fs-nfsd.mount var-lib-nfs-rpc_pipefs.mount rpcbind.service
-Requires=nfs-idmap.service nfs-mountd.service nfs-rquotad.service
-After=network.target named.service nfs-lock.service
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-StandardError=syslog+console
-EnvironmentFile=-/etc/sysconfig/nfs
-ExecStartPre=/usr/libexec/nfs-utils/scripts/nfs-server.preconfig
-ExecStartPre=/usr/sbin/exportfs -r
-ExecStart=/usr/sbin/rpc.nfsd $RPCNFSDARGS $RPCNFSDCOUNT
-ExecStartPost=-/usr/libexec/nfs-utils/scripts/nfs-server.postconfig
-ExecStop=/usr/sbin/rpc.nfsd 0
-ExecStopPost=/usr/sbin/exportfs -f
-ExecReload=/usr/sbin/exportfs -r
-
-[Install]
-WantedBy=nfs.target
-Also=nfs.target
-
diff --git a/nfs.target b/nfs.target
deleted file mode 100644
index 6c3262a..0000000
--- a/nfs.target
+++ /dev/null
@@ -1,7 +0,0 @@
-[Unit]
-Description=Network File System Server
-Requires=var-lib-nfs-rpc_pipefs.mount proc-fs-nfsd.mount rpcbind.service
-After=network.target named.service 
-
-[Install]
-WantedBy=multi-user.target
diff --git a/nfs4-modalias.conf b/nfs4-modalias.conf
deleted file mode 100644
index 1e71924..0000000
--- a/nfs4-modalias.conf
+++ /dev/null
@@ -1 +0,0 @@
-alias nfs4 nfs
diff --git a/proc-fs-nfsd.mount b/proc-fs-nfsd.mount
deleted file mode 100644
index e5ee6fb..0000000
--- a/proc-fs-nfsd.mount
+++ /dev/null
@@ -1,8 +0,0 @@
-[Unit]
-Description=RPC Pipe File System 
-DefaultDependencies=no
-
-[Mount]
-What=sunrpc
-Where=/proc/fs/nfsd
-Type=nfsd
diff --git a/var-lib-nfs-rpc_pipefs.mount b/var-lib-nfs-rpc_pipefs.mount
deleted file mode 100644
index d27e1a2..0000000
--- a/var-lib-nfs-rpc_pipefs.mount
+++ /dev/null
@@ -1,8 +0,0 @@
-[Unit]
-Description=RPC Pipe File System 
-DefaultDependencies=no
-
-[Mount]
-What=sunrpc
-Where=/var/lib/nfs/rpc_pipefs
-Type=rpc_pipefs