--- a/profilesservices/ProfileEngine/ProfileScheduleEventSrc/CProfileChangeEvent.cpp	Fri Mar 12 15:43:47 2010 +0200
+++ b/profilesservices/ProfileEngine/ProfileScheduleEventSrc/CProfileChangeEvent.cpp	Mon Mar 15 12:41:46 2010 +0200
@@ -28,7 +28,7 @@
 #include    <barsc.h>
 #include    <bautils.h>
 
-#include	<SecondaryDisplay/SecondaryDisplayProfilesAPI.h>
+#include	<secondarydisplay\SecondaryDisplayProfilesAPI.h>
 #include	<aknSDData.h>
 #include	<featmgr.h>
 
@@ -37,9 +37,6 @@
 #include    <ProfileEngineConstants.h>
 #include    "ProfilesDebug.h"
 
-#include    <MProfileEngineExtended.h>
-#include    <MProfileExtended.h>
-#include    <MProfileName.h>
 
 // CONSTANTS
 namespace
@@ -83,8 +80,7 @@
         error = iMutex.OpenGlobal( KProfileMutexName );
         }
     User::LeaveIfError( error );
-    iProfileEngine = CreateProfileEngineExtendedL( &iFs );
-    iCenRep = CRepository::NewL( KCRUidProfileEngine );
+    iProfileEngine = CreateProfileEngineL( &iFs );
     iGlobalNote = CAknGlobalNote::NewL();
     ReadResourcesL();
     }
@@ -123,7 +119,6 @@
     {
     delete iNoteText;
     delete iGlobalNote;
-    delete iCenRep;
     if( iProfileEngine )
         {
         iProfileEngine->Release();
@@ -180,21 +175,8 @@
     {
 	PRODEBUG( " CProfileChangeEvent:ChangeProfileL" );
 
-	TBool nameEqual = EFalse;
-	HBufC* previousName = HBufC::NewL( PROFILES_MAX_NAME_LENGTH );
-	CleanupStack::PushL( previousName );  
-	TPtr tempName = previousName->Des();
-	User::LeaveIfError( iCenRep->Get( KProEngPreviousActiveName, tempName ) );
-	if( tempName.Length() )
-		{
-		nameEqual = tempName.Compare( iProfileEngine->ProfileL( iPreviousId )->ProfileName().Name() );
-		}
-	if( !nameEqual )
-		{
     iProfileEngine->SetActiveProfileL( iPreviousId );
-		}
-	User::LeaveIfError( iCenRep->Set( KProEngPreviousActiveName, KNullDesC ) );
-	CleanupStack::PopAndDestroy();
+
     }
 
 // -----------------------------------------------------------------------------