diff -r ccb4f6b3db21 -r 8cb079868133 psmservices/psmserver/src/client/psmclientimpl.cpp
--- a/psmservices/psmserver/src/client/psmclientimpl.cpp	Tue Aug 31 16:29:05 2010 +0300
+++ b/psmservices/psmserver/src/client/psmclientimpl.cpp	Wed Sep 01 12:34:26 2010 +0100
@@ -63,10 +63,12 @@
 CPsmClientImpl::~CPsmClientImpl()
     {
     COMPONENT_TRACE( ( _L( "PSM Client - CPsmClientImpl::~CPsmClientImpl()" ) ) );
-    
+
     CancelPowerSaveModeChange();
+
     delete iActive;
     delete iSettings;
+
     iPsmServer.Close();
 
     COMPONENT_TRACE( ( _L( "PSM Client - CPsmClientImpl::~CPsmClientImpl - return" ) ) );
@@ -167,39 +169,4 @@
     return *iSettings;
     }
 
-#ifdef _DEBUG     
-TInt CPsmClientImpl::HeapMark()
-    {
-    COMPONENT_TRACE( ( _L( "PSM Client - CPsmClientImpl::HeapMark()" ) ) );
-    TInt err = iPsmServer.SendReceiveSync( EDebugHeapMark, TIpcArgs() );
-    COMPONENT_TRACE( ( _L( "PSM Client - CPsmClientImpl::HeapMark - return" ) ) );   
-    return err;
-    }
-
-TInt CPsmClientImpl::HeapMarkEnd()
-    {
-    COMPONENT_TRACE( ( _L( "PSM Client - CPsmClientImpl::HeapMarkEnd()" ) ) );
-    TInt err = iPsmServer.SendReceiveSync( EDebugHeapMarkEnd, TIpcArgs() );   
-    COMPONENT_TRACE( ( _L( "PSM Client - CPsmClientImpl::HeapMarkEnd - return" ) ) );   
-    return err;    
-    }
-
-TInt CPsmClientImpl::SetHeapFailure(TInt aFailureRate)
-    {
-    COMPONENT_TRACE( ( _L( "PSM Client - CPsmClientImpl::SetHeapFailure()" ) ) );
-    TInt err = iPsmServer.SendReceiveSync( EDebugSetHeapFailure, TIpcArgs(aFailureRate) );
-    COMPONENT_TRACE( ( _L( "PSM Client - CPsmClientImpl::SetHeapFailure - return" ) ) );   
-    return err; 
-    }
-
-TInt CPsmClientImpl::HeapReset()
-    {
-    COMPONENT_TRACE( ( _L( "PSM Client - CPsmClientImpl::HeapReset()" ) ) );
-    TInt err = iPsmServer.SendReceiveSync( EDebugHeapReset, TIpcArgs() );
-    COMPONENT_TRACE( ( _L( "PSM Client - CPsmClientImpl::HeapReset - return" ) ) );   
-    return err; 
-    }
-
-#endif //_DEBUG     
-
 // End of file