--- a/installationservices/swi/source/swis/server/statemachine.cpp	Tue Aug 31 15:21:33 2010 +0300
+++ b/installationservices/swi/source/swis/server/statemachine.cpp	Wed Sep 01 12:22:02 2010 +0100
@@ -20,9 +20,6 @@
 #include "log.h"
 #include "plan.h"
 #include "swispubsubdefs.h"
-#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK  
-#include <usif/scr/appregentries.h>
-#endif
 
 namespace Swi
 {
@@ -55,11 +52,11 @@
 	Cancel();
 	// close UISS session
 	iUiHandler.Close();
+	delete iProgressPublisher;
 	
 #ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
 	iStsSession.Close();
 	delete iRegistryWrapper;
-	delete iProgressPublisher;
 #else
 	delete iIntegrityServices;
 #endif
@@ -72,12 +69,12 @@
 	{
 	// mark the installation/un-installation operation as unconfirmed to start with
 	iOperationConfirmed = EFalse;
-
+	iProgressPublisher = Swi::CProgressBarValuePublisher::NewL();
+	iUiHandler.SetProgressBarValuePublisher(iProgressPublisher);
+	
 #ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
 	iStsSession.CreateTransactionL();	
 	iRegistryWrapper = CRegistryWrapper::NewL();
-	iProgressPublisher = CProgressBarValuePublisher::NewL();
-	iUiHandler.SetProgressBarValuePublisher(iProgressPublisher);
 #else
 	// Create integrity services, use the current time as transaction ID
 	TTime currentTime;
@@ -350,15 +347,6 @@
 		// re-generate the sisregistry cache .. very time consuming!
 		ResetRegistryCache();
 		}
-#else
-	// Deregister the force registered applications from AppArc
-	DEBUG_PRINTF(_L8("Deregistering the force registered applications with AppArc"));
-	RSisLauncherSession launcher;
-	CleanupClosePushL(launcher);
-	User::LeaveIfError(launcher.Connect());
-	RArray<TAppUpdateInfo> emptyAppRegDataArray;
-	launcher.NotifyNewAppsL(emptyAppRegDataArray);
-	CleanupStack::PopAndDestroy(&launcher);
 #endif
 
 	iMessage.Complete(aError);
@@ -435,10 +423,10 @@
 	{
 	iIsInInfoMode = aOperationalMode;
 	}
+#endif
 
 void CSwisStateMachine::SetFinalProgressBarValue(TInt aValue)
 	{
 	iProgressPublisher->SetFinalProgressBarValue(aValue);
 	}
-#endif
 } // namespace Swi