--- a/networkprotocolmodules/privacyprotocolmodule/PrivacyProtocolModule/src/privacyshutdown.cpp	Tue Aug 31 16:38:06 2010 +0300
+++ b/networkprotocolmodules/privacyprotocolmodule/PrivacyProtocolModule/src/privacyshutdown.cpp	Wed Sep 01 12:35:25 2010 +0100
@@ -19,10 +19,6 @@
 #include "privacyshutdown.h"
 
 
-// P&S Key we check how many outstanding requests there are
-const TInt EPrivacyNumberOfRequest = 0x1028720F;
-
-
 /**
 Static public constructor
 */
@@ -43,8 +39,7 @@
 add timer to active scheduler.
 */	
 CPrivacyShutdown::CPrivacyShutdown() : CTimer(CActive::EPriorityStandard),
-	iState(EShutdownStateIdle),
-	iTimerCount(0)
+	iState(EShutdownStateIdle)
 	{
 	LBSLOG(ELogP1, "CPrivacyShutdown::CPrivacyShutdown() Begin\n");
 	CActiveScheduler::Add(this);
@@ -84,7 +79,6 @@
 	{
 	LBSLOG(ELogP1, "CPrivacyShutdown::Start() Begin\n");
 	iState = EShutdownStateTimerStarted;
-	iTimerCount = aDelay;
 	After(aDelay);
 	LBSLOG(ELogP1, "CPrivacyShutdown::Start() End\n");
 	}
@@ -108,27 +102,16 @@
 	{
 	LBSLOG(ELogP1, "CPrivacyShutdown::RunL() Begin\n");
 
-	// Check if there are any notifications outstanding
-	TInt outstandingRequests = 0;
-    RProperty::Get(KUidSystemCategory, EPrivacyNumberOfRequest, outstandingRequests);
-    if (outstandingRequests > 0)
-        {
-        LBSLOG(ELogP1, "CPrivacyShutdown::RunL() - Restarting Timer\n")
-        Start(iTimerCount);
-        }
-    else
-        {
-        iState = EShutdownStateShutdownRequested;
-    
-        RLbsSystemController systemController;
-        RProcess process;
-        systemController.OpenL(process.SecureId());
-        CleanupClosePushL(systemController);
-        
-        systemController.RequestSystemCloseDown(ETrue);
-        
-        CleanupStack::PopAndDestroy(&systemController);
-        }
+	iState = EShutdownStateShutdownRequested;
+
+	RLbsSystemController systemController;
+	RProcess process;
+	systemController.OpenL(process.SecureId());
+	CleanupClosePushL(systemController);
+	
+	systemController.RequestSystemCloseDown(ETrue);
+	
+	CleanupStack::PopAndDestroy(&systemController);
 	
 	LBSLOG(ELogP1, "CPrivacyShutdown::RunL() End\n");
 	}