SCSI cleanups.