diff --git a/sys/dev/usb/umass.c b/sys/dev/usb/umass.c
index bf1f00dcf7e4..2153d3aeed90 100644
--- a/sys/dev/usb/umass.c
+++ b/sys/dev/usb/umass.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: umass.c,v 1.59 2001/04/19 00:47:49 augustss Exp $	*/
+/*	$NetBSD: umass.c,v 1.60 2001/04/19 00:50:22 augustss Exp $	*/
 /*-
  * Copyright (c) 1999 MAEKAWA Masahide <bishop@rr.iij4u.or.jp>,
  *		      Nick Hibma <n_hibma@freebsd.org>
@@ -150,104 +150,6 @@ char *states[TSTATE_STATES+1] = {
 };
 #endif
 
-#define US_SC_8020 0
-#define US_SC_8070 0
-#define US_SC_SCSI 0
-#define US_SC_UFI 0
-#define US_SC_QIC 0
-#define US_SC_RBC 0
-#define US_PR_CBI 0
-#define US_PR_CB 0
-#define US_PR_BULK 0
-#define US_PR_SCM_ATAPI 0
-#define US_PR_EUSB_SDDR09 0
-#define US_PR_DPCM_USB 0
-#define US_PR_FREECOM 0
-#define init_8200e 0
-#define usb_stor_euscsi_init 0
-#define freecom_init 0
-#define US_FL_SCM_MULT_TARG 0
-#define US_FL_SINGLE_LUN 0
-#define US_FL_START_STOP 0
-#define US_FL_MODE_XLATE 0
-#define US_FL_IGNORE_SER 0
-struct umass_special {
-	u_int16_t vendor;
-	u_int16_t product;
-	u_int16_t revlo, revhi;
-	u_int8_t busproto;
-	u_int8_t usbproto;
-	void (*init)(void *);
-	u_int32_t flags;
-} umass_specials[] = {
-	{ USB_VENDOR_MITSUMI, USB_PRODUCT_MITSUMI_CDRRW,	0x0000, 0x0245, 
-	  US_SC_8020, US_PR_CBI, NULL, 0 },
-	{ USB_VENDOR_HP, USB_PRODUCT_HP_CDWRITERPLUS,		0x0200, 0x0200, 
-	  US_SC_8070, US_PR_CB, NULL, 0 },
-	{ USB_VENDOR_HP, USB_PRODUCT_HP_CDW8200,		0x0001, 0x0001, 
-	  US_SC_8070, US_PR_SCM_ATAPI, init_8200e, 0 },
-	{ USB_VENDOR_TAUGA, USB_PRODUCT_TAUGA_CAMERAMATE,	0x0100, 0x0100,
-	  US_SC_SCSI, US_PR_DPCM_USB, NULL, US_FL_START_STOP },
-	{ USB_VENDOR_SHUTTLE, USB_PRODUCT_SHUTTLE_EUSB,		0x0200, 0x0200, 
-	  US_SC_8020, US_PR_CB, NULL, 0 },
-	{ USB_VENDOR_SHUTTLE, USB_PRODUCT_SHUTTLE_EUSCSI,	0x0100, 0x0100, 
-	  US_SC_SCSI, US_PR_BULK, usb_stor_euscsi_init, US_FL_SCM_MULT_TARG },
-	{ USB_VENDOR_SHUTTLE, USB_PRODUCT_SHUTTLE_SDDR09,	0x0000, 0x9999, 
-	  US_SC_SCSI, US_PR_EUSB_SDDR09, NULL, US_FL_SINGLE_LUN | US_FL_START_STOP },
-	{ USB_VENDOR_SHUTTLE, USB_PRODUCT_SHUTTLE_ZIOMMC,	0x0100, 0x0200, 
-	  US_SC_SCSI, US_PR_CB, NULL, US_FL_SINGLE_LUN },
-	{ USB_VENDOR_SHUTTLE, USB_PRODUCT_SHUTTLE_HIFD,		0x0100, 0x0200, 
-	  US_SC_SCSI, US_PR_CB, NULL, US_FL_SINGLE_LUN },
-	{ USB_VENDOR_SHUTTLE, USB_PRODUCT_SHUTTLE_EUSBATAPI,	0x0200, 0x0200, 
-	  US_SC_8020, US_PR_CB, NULL, 0 },
-	{ USB_VENDOR_SHUTTLE, USB_PRODUCT_SHUTTLE_CF,		0x0200, 0x0200, 
-	  US_SC_8020, US_PR_CB, NULL, 0 },
-	{ USB_VENDOR_SHUTTLE, USB_PRODUCT_SHUTTLE_EUSCSI_B,	0x0100, 0x0100, 
-	  US_SC_SCSI, US_PR_BULK, usb_stor_euscsi_init, US_FL_SCM_MULT_TARG },
-	{ USB_VENDOR_SHUTTLE, USB_PRODUCT_SHUTTLE_EUSCSI_C,	0x0100, 0x0100, 
-	  US_SC_SCSI, US_PR_BULK, usb_stor_euscsi_init, US_FL_SCM_MULT_TARG },
-	{ USB_VENDOR_SHUTTLE, USB_PRODUCT_SHUTTLE_CDRW,		0x0200, 0x0200, 
-	  US_SC_8020, US_PR_CB, NULL, 0 },
-	{ USB_VENDOR_SONY, USB_PRODUCT_SONY_DSC,		0x0106, 0x0210, 
-	  US_SC_SCSI, US_PR_CB, NULL,
-		US_FL_SINGLE_LUN | US_FL_START_STOP | US_FL_MODE_XLATE },
-	{ USB_VENDOR_SONY, USB_PRODUCT_SONY_MSACUS1,		0x0100, 0x0100, 
-	  US_SC_UFI, US_PR_CB, NULL, US_FL_SINGLE_LUN | US_FL_START_STOP },
-	{ USB_VENDOR_YEDATA, USB_PRODUCT_YEDATA_FLASHBUSTERU,	0x0000, 0x0299, 
-	  US_SC_UFI,  US_PR_CB, NULL, US_FL_SINGLE_LUN },
-	{ USB_VENDOR_YEDATA, USB_PRODUCT_YEDATA_FLASHBUSTERU,	0x0300, 0x9999, 
-	  US_SC_UFI,  US_PR_CBI, NULL, US_FL_SINGLE_LUN },
-	{ USB_VENDOR_LACIE, USB_PRODUCT_LACIE_HD,		0x0200, 0x0200, 
-	  US_SC_RBC, US_PR_CB, NULL, 0 }, 
-	{ USB_VENDOR_INSYSTEM, USB_PRODUCT_INSYSTEM_ATAPI,	0x0100, 0x0100, 
-	  US_SC_8070, US_PR_BULK, NULL, 0 },
-	{ USB_VENDOR_TEAC, USB_PRODUCT_TEAC_FD05PUB,		0x0100, 0x0100, 
-	  US_SC_UFI, US_PR_CB, NULL, 0 },
-	{ USB_VENDOR_LINKSYS, USB_PRODUCT_LINKSYS_MAUSB2,	0x0100, 0x0100, 
-	  US_SC_SCSI, US_PR_EUSB_SDDR09, NULL, US_FL_SINGLE_LUN | US_FL_START_STOP },
-	{ USB_VENDOR_HAGIWARA, USB_PRODUCT_HAGIWARA_FGSM,	0x0100, 0x0100, 
-	  US_SC_SCSI, US_PR_BULK, NULL, 0 },
-	{ USB_VENDOR_HAGIWARA, USB_PRODUCT_HAGIWARA_FG,		0x0100, 0x0100,
-	  US_SC_SCSI, US_PR_BULK, NULL, 0 },
-	{ USB_VENDOR_SANDISK, USB_PRODUCT_SANDISK_SDDR05A,	0x0200, 0x0200, 
-	  US_SC_SCSI, US_PR_CB, NULL, US_FL_SINGLE_LUN | US_FL_START_STOP },
-	{ USB_VENDOR_SANDISK, USB_PRODUCT_SANDISK_SDDR12,	0x0100, 0x0100,
-	  US_SC_SCSI, US_PR_CB, NULL, US_FL_SINGLE_LUN },
-	{ USB_VENDOR_SANDISK, USB_PRODUCT_SANDISK_SDDR09,	0x0100, 0x0100, 
-	  US_SC_SCSI, US_PR_EUSB_SDDR09, NULL, US_FL_SINGLE_LUN | US_FL_START_STOP },
-	{ USB_VENDOR_SANDISK, USB_PRODUCT_SANDISK_SDDR31,	0x0009, 0x0009, 
-	  US_SC_SCSI, US_PR_BULK, NULL,	US_FL_IGNORE_SER },
-	{ USB_VENDOR_MICROTECH, USB_PRODUCT_MICROTECH_SCSIDB25,	0x0100, 0x0100, 
-	  US_SC_SCSI, US_PR_BULK, usb_stor_euscsi_init, US_FL_SCM_MULT_TARG },
-	{ USB_VENDOR_MICROTECH, USB_PRODUCT_MICROTECH_FREECOM,	0x0000, 0x9999,
-	  US_SC_QIC, US_PR_FREECOM, freecom_init, 0 },
-	{ USB_VENDOR_MICROTECH, USB_PRODUCT_MICROTECH_SCSIHD50,	0x0100, 0x0100, 
-	  US_SC_SCSI, US_PR_BULK, usb_stor_euscsi_init, US_FL_SCM_MULT_TARG },
-	{ USB_VENDOR_MICROTECH, USB_PRODUCT_MICROTECH_DPCM,	0x0100, 0x0100,
-	  US_SC_SCSI, US_PR_DPCM_USB, NULL, US_FL_START_STOP },
-	{ 0,0,0,0,0,0,NULL,0 }
-};
-
 /* USB device probe/attach/detach functions */
 USB_DECLARE_DRIVER(umass);
 Static void umass_disco(struct umass_softc *sc);