diff --git a/sys/alpha/conf/GENERIC b/sys/alpha/conf/GENERIC
index 3914db10305..c8051d85624 100644
--- a/sys/alpha/conf/GENERIC
+++ b/sys/alpha/conf/GENERIC
@@ -99,11 +99,6 @@ device		sa		# Sequential Access (tape etc)
 device		cd		# CD
 device		pass		# Passthrough device (direct SCSI access)
 
-#device		ses		# SCSI Environmental Services (and SAF-TE)
-#device		targ		# SCSI Target Mode Code
-#device		targbh		# SCSI Target Mode Blackhole Device
-#define		pt		# SCSI Processor Target Device
-
 # atkbdc0 controls both the keyboard and the PS/2 mouse
 device		atkbdc	1
 device		atkbd
diff --git a/sys/alpha/conf/NOTES b/sys/alpha/conf/NOTES
index 3914db10305..c8051d85624 100644
--- a/sys/alpha/conf/NOTES
+++ b/sys/alpha/conf/NOTES
@@ -99,11 +99,6 @@ device		sa		# Sequential Access (tape etc)
 device		cd		# CD
 device		pass		# Passthrough device (direct SCSI access)
 
-#device		ses		# SCSI Environmental Services (and SAF-TE)
-#device		targ		# SCSI Target Mode Code
-#device		targbh		# SCSI Target Mode Blackhole Device
-#define		pt		# SCSI Processor Target Device
-
 # atkbdc0 controls both the keyboard and the PS/2 mouse
 device		atkbdc	1
 device		atkbd
diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC
index 3656b0b9e45..2e2bc9d6dfa 100644
--- a/sys/amd64/conf/GENERIC
+++ b/sys/amd64/conf/GENERIC
@@ -106,11 +106,6 @@ device		sa		# Sequential Access (tape etc)
 device		cd		# CD
 device		pass		# Passthrough device (direct SCSI access)
 
-#device		ses		# SCSI Environmental Services (and SAF-TE)
-#device		targ		# SCSI Target Mode Code
-#device		targbh		# SCSI Target Mode Blackhole Device
-#define		pt		# SCSI Processor Target Device
-
 # RAID controllers
 device		ida		# Compaq Smart RAID
 device		amr		# AMI MegaRAID
diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC
index 3656b0b9e45..2e2bc9d6dfa 100644
--- a/sys/i386/conf/GENERIC
+++ b/sys/i386/conf/GENERIC
@@ -106,11 +106,6 @@ device		sa		# Sequential Access (tape etc)
 device		cd		# CD
 device		pass		# Passthrough device (direct SCSI access)
 
-#device		ses		# SCSI Environmental Services (and SAF-TE)
-#device		targ		# SCSI Target Mode Code
-#device		targbh		# SCSI Target Mode Blackhole Device
-#define		pt		# SCSI Processor Target Device
-
 # RAID controllers
 device		ida		# Compaq Smart RAID
 device		amr		# AMI MegaRAID