--- a/secureswitools/swisistools/source/interpretsislib/sisregistryobject.cpp	Tue Aug 31 15:21:33 2010 +0300
+++ b/secureswitools/swisistools/source/interpretsislib/sisregistryobject.cpp	Wed Sep 01 12:22:02 2010 +0100
@@ -124,12 +124,8 @@
 {
 	for( InstallableFiles::const_iterator curr = aFiles.begin(); curr != aFiles.end(); ++curr )
 	{	
-		InstallableFile* installableFile= *curr;	
-		#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
+		InstallableFile* installableFile= *curr;		
 		FileDescription* f = new FileDescription(*installableFile->FileDescription() , installableFile->Sid(), aTargetDrive, installableFile->GetTarget());
-		#else
-		FileDescription* f = new FileDescription(*installableFile->FileDescription() , installableFile->Sid(), aTargetDrive, installableFile->GetTarget(),installableFile->GetLocalTarget());
-		#endif //SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
 		iFileDescriptions.push_back(f);
 	}
 
@@ -384,11 +380,8 @@
 					aSids.push_back(aSid);
 				}
 			}
-			#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK //Just to ignore compiler
-			FileDescription* aFileDescription = new FileDescription(fileDesc, aSid, L'Z', fileDesc.Target().GetString(), fileDesc.Target().GetString());
-			#else
+
 			FileDescription* aFileDescription = new FileDescription(fileDesc, aSid, L'Z', fileDesc.Target().GetString());
-			#endif //SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
 			iFileDescriptions.push_back(aFileDescription);
 		}
 		SetSids(aSids);
@@ -731,11 +724,7 @@
 	{	
 		InstallableFile* installableFile= *curr;
 		TUint32 sid = installableFile->Sid();
-		#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
-		FileDescription* f = new FileDescription(*installableFile->FileDescription() , sid, iSelectedDrive, installableFile->GetTarget(),installableFile->GetLocalTarget());
-		#else
 		FileDescription* f = new FileDescription(*installableFile->FileDescription() , sid, iSelectedDrive, installableFile->GetTarget());
-		#endif //SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
 		iFileDescriptions.push_back(f);
 
 		// If the SID is there already there is no reason to add it again
@@ -756,13 +745,8 @@
 	{	
 		InstallableFile* installableFile= *curr;
 		TUint32 sid = installableFile->Sid();
-		#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
 		FileDescription f = FileDescription(*installableFile->FileDescription(), sid,
-											iSelectedDrive, installableFile->GetTarget(),installableFile->GetLocalTarget());
-		#else
-		FileDescription f = FileDescription(*installableFile->FileDescription(), sid,
-										iSelectedDrive, installableFile->GetTarget());
-		#endif //SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
+											iSelectedDrive, installableFile->GetTarget());
 		
 		FileDescriptions::const_iterator end = iFileDescriptions.end();
 		for (FileDescriptions::iterator curr2 = iFileDescriptions.begin();