--- a/usbmgmt/usbmgr/usbman/server/SRC/CUsbSession.cpp	Thu Sep 02 22:23:37 2010 +0300
+++ b/usbmgmt/usbmgr/usbman/server/SRC/CUsbSession.cpp	Fri Sep 17 08:40:15 2010 +0300
@@ -95,10 +95,8 @@
 	iUsbServer->Device().DeRegisterObserver(*this);
 
 #ifdef SYMBIAN_ENABLE_USB_OTG_HOST_PRIV
-#ifndef __OVER_DUMMYUSBDI__
 	OstTrace1( TRACE_NORMAL, CUSBSESSION_CUSBSESSION_DUP1, "CUsbSession::~CUsbSession;About to Otg().DeRegisterObserver(%08x)", this );
 	iUsbServer->Otg().DeRegisterObserver(*this);
-#endif
 
 	OstTrace1( TRACE_NORMAL, CUSBSESSION_CUSBSESSION_DUP2, "CUsbSession::~CUsbSession;About to Host().DeRegisterObserver(%08x)", this );
 	iUsbServer->Host().DeregisterObserver(*this);
@@ -147,10 +145,8 @@
 	iUsbServer->Device().RegisterObserverL(*this);
 
 #ifdef SYMBIAN_ENABLE_USB_OTG_HOST_PRIV
-#ifndef __OVER_DUMMYUSBDI__
 	OstTrace0( TRACE_NORMAL, CUSBSESSION_CREATEL_DUP1, "CUsbSession::CreateL;Registering OTG Observer" );
 	iUsbServer->Otg().RegisterObserverL(*this);
-#endif
 
 	OstTrace0( TRACE_NORMAL, CUSBSESSION_CREATEL_DUP2, "CUsbSession::CreateL;Registering HOST Observer" );
 	iUsbServer->Host().RegisterObserverL(*this);
@@ -582,7 +578,6 @@
 	case EUsbCancelMessageObserver:
 		ret = DeRegisterMsgObserver();
 		break;
-#ifndef __OVER_DUMMYUSBDI__
 	case EUsbBusRequest:
 		ret = BusRequest();
 		break;
@@ -595,14 +590,6 @@
 	case EUsbBusDrop:
 		ret = BusDrop();
 		break;
-#else
-	case EUsbBusRequest:
-	case EUsbBusRespondSrp:
-	case EUsbBusClearError:
-	case EUsbBusDrop:
-		ret = KErrNone;
-		break;
-#endif
 	case EUsbRegisterHostObserver:
 		ret = RegisterHostObserver(aMessage, complete);
 		break;