diff -r 0897fb188e2a -r 4bea936937d0 usbmgmt/usbmgrtest/t_usbman/src/t_usbman.cpp
--- a/usbmgmt/usbmgrtest/t_usbman/src/t_usbman.cpp	Wed Jun 23 20:17:18 2010 +0300
+++ b/usbmgmt/usbmgrtest/t_usbman/src/t_usbman.cpp	Tue Jul 06 16:23:38 2010 +0300
@@ -41,8 +41,6 @@
 RUsb TheSecondUsbSession;
 TBool ThePrimaryClient;
 
-//_LIT(KUsbCsyName, "ECACM");
-//_LIT(KUsbPortName, "ACM::0");
 _LIT(KUsbLddName, "EUSBC");
 
 // These are used in the startup stress test.
@@ -656,19 +654,7 @@
 
 	TheSecondUsbSession.Close();
 	}
-/*
-void RegisterAsPrimaryClientL()
-	{
-	LEAVEIFERROR(TheUsb.RegisterAsPrimarySession());
-	ThePrimaryClient = ETrue;
-	}
 
-void DeregisterAsPrimaryClientL()
-	{
-	LEAVEIFERROR(TheUsb.DeregisterAsPrimarySession());
-	ThePrimaryClient = EFalse;
-	}
-*/
 void DbgCheckHeapL()
 	{
 	_printf(_L("Expected number of allocated heap cells: "));
@@ -1050,9 +1036,7 @@
 	case '5': SetUsbSerialNumberL(); break;
 	case 's': case 'S': SanityTestL(); break;
 #ifndef HURRICANE
-/*	case 'r': RegisterAsPrimaryClientL(); break;
-	case 'd': DeregisterAsPrimaryClientL(); break;
-*/	case 'm': MemoryTestsL(); break;
+	case 'm': MemoryTestsL(); break;
 #endif // HURRICANE
 	case 'c': case 'C': CloseUsbL(); break;
 	case 'o': case 'O': OpenUsbL(); break;
@@ -1105,9 +1089,7 @@
 		_printf(_L("5. Publish Serial Number\n"));
 		_printf(_L("S. Sanity test- quickly calls all APIs to make sure they don't panic\n"));
 #ifndef HURRICANE
-/*		_printf(_L("R. Register as primary client\n"));
-		_printf(_L("D. Deregister as primary client\n"));
-*/		_printf(_L("M. Memory tests\n"));
+		_printf(_L("M. Memory tests\n"));
 #endif // HURRICANE
 		_printf(_L("C. Close connection to USB Manager\n"));
 		_printf(_L("O. Connect to USB Manager\n"));