--- a/default-configs/pci.mak
+++ b/default-configs/pci.mak
@@ -16,4 +16,3 @@ CONFIG_SERIAL=y
 CONFIG_SERIAL_PCI=y
 CONFIG_WDT_IB6300ESB=y
 CONFIG_PCI_TESTDEV=y
-CONFIG_NVME_PCI=y
--- a/default-configs/usb.mak
+++ b/default-configs/usb.mak
@@ -1,3 +1,2 @@
 CONFIG_USB_STORAGE_BOT=y
-CONFIG_USB_STORAGE_MTP=y
 CONFIG_USB_SMARTCARD=y