diff --git a/BeagleBoardPkg/BeagleBoardPkg.dsc b/BeagleBoardPkg/BeagleBoardPkg.dsc
index 0a836a9426..16fdb1ac80 100644
--- a/BeagleBoardPkg/BeagleBoardPkg.dsc
+++ b/BeagleBoardPkg/BeagleBoardPkg.dsc
@@ -114,8 +114,6 @@
   ArmDisassemblerLib|ArmPkg/Library/ArmDisassemblerLib/ArmDisassemblerLib.inf
   DebugAgentLib|MdeModulePkg/Library/DebugAgentLibNull/DebugAgentLibNull.inf
 
-UsbLib|AppleCommonPkg/Library/AppleUsbLib/AppleUsbDxeLib.inf
-
 [LibraryClasses.common.SEC]
   ArmLib|ArmPkg/Library/ArmLib/ArmV7/ArmV7LibPrePi.inf
   PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf
@@ -387,13 +385,6 @@ UsbLib|AppleCommonPkg/Library/AppleUsbLib/AppleUsbDxeLib.inf
   MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxe.inf
   MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf
 
-  AppleCommonPkg/Bus/Pci/EhciDxe/Ehci.inf
-  AppleCommonPkg/Bus/Usb/UsbBotDxe/UsbBot.inf
-  AppleCommonPkg/Bus/Usb/UsbCbiDxe/Cbi0/UsbCbi0.inf
-  AppleCommonPkg/Bus/Usb/UsbCbiDxe/Cbi1/UsbCbi1.inf
-  AppleCommonPkg/Bus/Usb/UsbBusDxe/UsbBus.inf
-  AppleCommonPkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorage.inf
-
   #
   # Nand Flash
   #
diff --git a/BeagleBoardPkg/BeagleBoardPkg.fdf b/BeagleBoardPkg/BeagleBoardPkg.fdf
index d19622c8fb..bd27962a50 100644
--- a/BeagleBoardPkg/BeagleBoardPkg.fdf
+++ b/BeagleBoardPkg/BeagleBoardPkg.fdf
@@ -156,16 +156,9 @@ READ_LOCK_STATUS   = TRUE
 
   #NOTE: Open source EHCI stack doesn't work on Beagleboard.
   #NOTE: UsbBus and UsbMassStorage don't work using iPhond SDK tool chain.
-##  INF MdeModulePkg/Bus/Pci/EhciDxe/EhciDxe.inf
-##  INF MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxe.inf
-##  INF MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf
-
-  INF AppleCommonPkg/Bus/Pci/EhciDxe/Ehci.inf 
-  INF AppleCommonPkg/Bus/Usb/UsbBotDxe/UsbBot.inf
-  INF AppleCommonPkg/Bus/Usb/UsbCbiDxe/Cbi0/UsbCbi0.inf
-  INF AppleCommonPkg/Bus/Usb/UsbCbiDxe/Cbi1/UsbCbi1.inf
-  INF AppleCommonPkg/Bus/Usb/UsbBusDxe/UsbBus.inf
-  INF AppleCommonPkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorage.inf
+  INF MdeModulePkg/Bus/Pci/EhciDxe/EhciDxe.inf
+  INF MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxe.inf
+  INF MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf
 
   #
   # UEFI application (Shell Embedded Boot Loader)