diff --git a/source/devicemounter/usbstorage.c b/source/devicemounter/usbstorage.c
index 28275c9c..f96337c2 100644
--- a/source/devicemounter/usbstorage.c
+++ b/source/devicemounter/usbstorage.c
@@ -51,12 +51,6 @@
 #define USB_IOCTL_UMS_TESTMODE			(UMS_BASE+0x81)
 #define USB_IOCTL_SET_PORT				(UMS_BASE+0x83)
 
-#define WBFS_BASE			(('W'<<24)|('F'<<16)|('S'<<8))
-#define USB_IOCTL_WBFS_OPEN_DISC		(WBFS_BASE+0x1)
-#define USB_IOCTL_WBFS_READ_DISC		(WBFS_BASE+0x2)
-#define USB_IOCTL_WBFS_SET_DEVICE		(WBFS_BASE+0x50)
-#define USB_IOCTL_WBFS_SET_FRAGLIST		(WBFS_BASE+0x51)
-
 #define MAX_SECTOR_SIZE			4096
 #define MAX_BUFFER_SECTORS		128
 #define UMS_HEAPSIZE			2*1024
@@ -321,15 +315,6 @@ s32 USBStorage2_GetSectorSize()
 	return 0;
 }
 
-s32 USBStorage2_WBFS_SetDevice(int dev)
-{
-	s32 retval = 0;
-	s32 ret = IOS_IoctlvFormat(hid, fd, USB_IOCTL_WBFS_SET_DEVICE, "i:i", dev, &retval);
-	if(retval)
-		return retval;
-	return ret;
-}
-
 static bool __usbstorage_Startup(void)
 {
 	return USBStorage2_Init(0) >= 0;
diff --git a/source/devicemounter/usbstorage.h b/source/devicemounter/usbstorage.h
index 0e484ffb..4ef85c5f 100644
--- a/source/devicemounter/usbstorage.h
+++ b/source/devicemounter/usbstorage.h
@@ -24,8 +24,6 @@ s32 USBStorage2_GetSectorSize();
 s32 USBStorage2_SetPort(s8 port);
 s8 USBStorage2_GetPort();
 
-s32 USBStorage2_WBFS_SetDevice(int dev);
-
 extern int usb_libogc_mode;
 
 #define DEVICE_TYPE_WII_UMS (('W'<<24)|('U'<<16)|('M'<<8)|'S')
diff --git a/source/menu/menu_game.cpp b/source/menu/menu_game.cpp
index 8b5a35b2..9b2381cc 100644
--- a/source/menu/menu_game.cpp
+++ b/source/menu/menu_game.cpp
@@ -1431,8 +1431,6 @@ void CMenu::_launchGame(dir_discHdr *hdr, bool dvd)
 		wbfs_partition = (DeviceHandle.GetFSType(currentPartition) == PART_FS_WBFS);
 		if(!wbfs_partition && get_frag_list((u8 *)id.c_str(), (char*)path.c_str(), currentPartition == 0 ? 0x200 : USBStorage2_GetSectorSize()) < 0)
 			Sys_Exit();
-		if(currentPartition == 0)
-			USBStorage2_WBFS_SetDevice(1);
 		WBFS_Close();
 	}
 	if(gameconfig.get() != NULL)