diff --git a/sys/conf/nfsswapkernel.c b/sys/conf/nfsswapkernel.c
index 432109cb3933..aedf7ef3e52d 100644
--- a/sys/conf/nfsswapkernel.c
+++ b/sys/conf/nfsswapkernel.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  * from: @(#)nfsswapvmunix.c	8.1 (Berkeley) 6/10/93
- * $Id$
+ * $Id: nfsswapkernel.c,v 1.3 1997/02/22 09:28:14 peter Exp $
  */
 
 /*
@@ -59,10 +59,6 @@ dev_t	rootdev = NODEV;
 dev_t	argdev  = NODEV;
 dev_t	dumpdev = NODEV;
 
-struct	swdevt swdevt[] = {
-	{ NODEV,	0,	5000 },	/* happy:/u/swap.dopey  */
-	{ 0, 0, 0 }
-};
 struct nfs_diskless nfs_diskless = {
 	{ { 'q', 'e', '0', '\0' },
 	  { 0x10, 0x2, { 0x0, 0x0, 0x83, 0x68, 0x30, 0x2, } },
diff --git a/sys/i386/i386/swapgeneric.c b/sys/i386/i386/swapgeneric.c
index 4a1f57605c12..988c07219074 100644
--- a/sys/i386/i386/swapgeneric.c
+++ b/sys/i386/i386/swapgeneric.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)swapgeneric.c	5.5 (Berkeley) 5/9/91
- *	$Id$
+ *	$Id: swapgeneric.c,v 1.21 1997/02/22 09:32:49 peter Exp $
  */
 
 #include <sys/param.h>
@@ -52,7 +52,6 @@
 #include "wd.h"
 #include "fd.h"
 #include "sd.h"
-#include "vn.h"
 #include "cd.h"
 #include "mcd.h"
 #include "scd.h"
@@ -65,19 +64,6 @@
 dev_t	rootdev = NODEV;
 dev_t	dumpdev = NODEV;
 
-#ifdef notused
-int	nswap;
-struct	swdevt swdevt[] = {
-	{ makedev (0xFF, 0x00000001),	0,	0 },
-#if NVN > 0
-	{ makedev (15, 0x00000001),	0,	0 },
-#endif
-	{ NODEV,	0,	0 }, /* For NFS diskless */
-	{ NODEV,	0,	0 },
-};
-int	dmmin, dmmax, dmtext;
-#endif
-
 void gets __P((char *));
 
 struct	genericconf {
diff --git a/sys/nfs/nfs_vfsops.c b/sys/nfs/nfs_vfsops.c
index 170c6991231b..663086a1e7da 100644
--- a/sys/nfs/nfs_vfsops.c
+++ b/sys/nfs/nfs_vfsops.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_vfsops.c	8.12 (Berkeley) 5/20/95
- * $Id: nfs_vfsops.c,v 1.45 1997/08/16 19:16:04 wollman Exp $
+ * $Id: nfs_vfsops.c,v 1.46 1997/09/02 01:19:41 bde Exp $
  */
 
 #include <sys/param.h>
@@ -382,8 +382,6 @@ nfs_fsinfo(nmp, vp, cred, p)
  *   can talk to the server
  * - If nfs_diskless.mygateway is filled in, use that address as
  *   a default gateway.
- * - hand craft the swap nfs vnode hanging off a fake mount point
- *	if swdevt[0].sw_dev == NODEV
  * - build the rootfs mount point and call mountnfs() to do the rest.
  */
 int
diff --git a/sys/nfs/nfsdiskless.h b/sys/nfs/nfsdiskless.h
index 2fcb0a0d0365..f499a2c4baea 100644
--- a/sys/nfs/nfsdiskless.h
+++ b/sys/nfs/nfsdiskless.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfsdiskless.h	8.2 (Berkeley) 3/30/95
- * $Id: nfsdiskless.h,v 1.8 1997/02/22 09:42:47 peter Exp $
+ * $Id: nfsdiskless.h,v 1.9 1997/05/12 19:02:55 tegge Exp $
  */
 
 
@@ -43,8 +43,8 @@
 
 /*
  * Structure that must be initialized for a diskless nfs client.
- * This structure is used by nfs_mountroot() to set up the root and swap
- * vnodes plus do a partial ifconfig(8) and route(8) so that the critical net
+ * This structure is used by nfs_mountroot() to set up the root vnode,
+ * and to do a partial ifconfig(8) and route(8) so that the critical net
  * interface can communicate with the server.
  * The primary bootstrap is expected to fill in the appropriate fields before
  * starting the kernel. Whether or not the swap area is nfs mounted is
diff --git a/sys/nfsclient/nfs_vfsops.c b/sys/nfsclient/nfs_vfsops.c
index 170c6991231b..663086a1e7da 100644
--- a/sys/nfsclient/nfs_vfsops.c
+++ b/sys/nfsclient/nfs_vfsops.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_vfsops.c	8.12 (Berkeley) 5/20/95
- * $Id: nfs_vfsops.c,v 1.45 1997/08/16 19:16:04 wollman Exp $
+ * $Id: nfs_vfsops.c,v 1.46 1997/09/02 01:19:41 bde Exp $
  */
 
 #include <sys/param.h>
@@ -382,8 +382,6 @@ nfs_fsinfo(nmp, vp, cred, p)
  *   can talk to the server
  * - If nfs_diskless.mygateway is filled in, use that address as
  *   a default gateway.
- * - hand craft the swap nfs vnode hanging off a fake mount point
- *	if swdevt[0].sw_dev == NODEV
  * - build the rootfs mount point and call mountnfs() to do the rest.
  */
 int
diff --git a/sys/nfsclient/nfsdiskless.h b/sys/nfsclient/nfsdiskless.h
index 2fcb0a0d0365..f499a2c4baea 100644
--- a/sys/nfsclient/nfsdiskless.h
+++ b/sys/nfsclient/nfsdiskless.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfsdiskless.h	8.2 (Berkeley) 3/30/95
- * $Id: nfsdiskless.h,v 1.8 1997/02/22 09:42:47 peter Exp $
+ * $Id: nfsdiskless.h,v 1.9 1997/05/12 19:02:55 tegge Exp $
  */
 
 
@@ -43,8 +43,8 @@
 
 /*
  * Structure that must be initialized for a diskless nfs client.
- * This structure is used by nfs_mountroot() to set up the root and swap
- * vnodes plus do a partial ifconfig(8) and route(8) so that the critical net
+ * This structure is used by nfs_mountroot() to set up the root vnode,
+ * and to do a partial ifconfig(8) and route(8) so that the critical net
  * interface can communicate with the server.
  * The primary bootstrap is expected to fill in the appropriate fields before
  * starting the kernel. Whether or not the swap area is nfs mounted is