diff --git a/sys/riscv/conf/GENERIC b/sys/riscv/conf/GENERIC
--- a/sys/riscv/conf/GENERIC
+++ b/sys/riscv/conf/GENERIC
@@ -123,15 +123,6 @@
 options 	HID_DEBUG	# enable debug msgs
 device		hid		# Generic HID support
 
-# DTrace support
-# device	dtrace
-# device	dtrace_profile
-# device	dtrace_sdt
-# device	dtrace_fbt
-# device	dtrace_systrace
-# device	dtrace_prototype
-# device	dtraceall
-
 # Serial (COM) ports
 device		uart		# Generic UART driver
 device		uart_lowrisc	# lowRISC UART driver
@@ -159,15 +150,6 @@
 device		spibus
 device		spigen
 
-# Uncomment for memory disk
-# options 	MD_ROOT
-# options 	MD_ROOT_SIZE=32768	# 32MB ram disk
-# makeoptions	MFS_IMAGE=/path/to/img
-# options 	ROOTDEVNAME=\"ufs:/dev/md0\"
-
-# Uncomment for virtio block device
-# options 	ROOTDEVNAME=\"ufs:/dev/vtbd0\"
-
 # Debugging support.  Always need this:
 options 	KDB			# Enable kernel debugger support.
 options 	KDB_TRACE		# Print a stack trace for a panic.