--- a/accessoryservices/remotecontrolfw/client/intermediate/src/interfaceselector.cpp	Tue Aug 31 16:29:05 2010 +0300
+++ b/accessoryservices/remotecontrolfw/client/intermediate/src/interfaceselector.cpp	Wed Sep 01 12:34:26 2010 +0100
@@ -103,11 +103,10 @@
 		}
 	CleanupStack::PopAndDestroy(currentHeap);
 	
-	RNestableLock* lock = new (ELeave) RNestableLock;
-    CleanupStack::PushL(lock);
-	LEAVEIFERRORL(lock->CreateLocal());
-	CleanupStack::Pop(lock);
-	iLock = lock;
+	iLock = new (ELeave) RNestableLock();
+	CleanupStack::PushL(iLock);
+	LEAVEIFERRORL(iLock->CreateLocal());
+	CleanupStack::Pop(iLock);
 	}
 
 CRemConInterfaceSelector::CRemConInterfaceSelector()
@@ -442,15 +441,15 @@
 void CRemConInterfaceSelector::BulkSessionConnectL()
 	{
 	LOG_FUNC
+	iBulkSession = new(ELeave)RRemConBulk();
+	CleanupStack::PushL(iBulkSession);
+	LEAVEIFERRORL(iBulkSession->Connect());
+	CleanupStack::Pop(iBulkSession);
 
-	RRemConBulk* bulkSession = new(ELeave)RRemConBulk;
-	CleanupStack::PushL(bulkSession);
-	LEAVEIFERRORL(bulkSession->Connect());
-	CleanupClosePushL(*bulkSession);
+	CleanupCloseDeleteAndNullPushL(reinterpret_cast<RRemCon**>(&iBulkSession));
 	RCIS_VERBOSE_ASSERT(iBulkReceiver, ERemConIfSelInternalError);
-	iBulkReceiver->InitialiseL(*bulkSession, iBulkMaxDataLength);
-	CleanupStack::Pop(2, bulkSession);
-	iBulkSession = bulkSession;
+	iBulkReceiver->InitialiseL(*iBulkSession, iBulkMaxDataLength);
+	CleanupStack::Pop(&iBulkSession);
 	}
 
 /**