diff -r b63e8c2d8cff -r 604cd42065d1 securitydialogs/SecUi/group/SecUi.mmp
--- a/securitydialogs/SecUi/group/SecUi.mmp	Thu Jun 17 12:11:51 2010 +0100
+++ b/securitydialogs/SecUi/group/SecUi.mmp	Thu Jul 22 16:43:28 2010 +0100
@@ -42,84 +42,27 @@
 
 MW_LAYER_SYSTEMINCLUDE ../../../inc 
 
-
-#ifdef __PROTOCOL_CDMA
-
-    SOURCEPATH ../Cdma/Src
-    SOURCE  SecUiSecuritySettingsCdma.cpp
-    SOURCE  SecUiSecurityHandlerCdma.cpp
-    SOURCE  SecUiObsStartterCdma.cpp
-    SOURCE  SecUiAutoLockSettingPageCdma.cpp
-    SOURCE  SecUiSystemLockCdma.cpp
-
-    SOURCEPATH ../Src
-    SOURCE  SecUi.cpp
-    SOURCE  SecUiCodeQueryDialog.cpp
-    SOURCE  SecUiCodeQueryControl.cpp
-    SOURCE  SecUiManualSecuritySettings.cpp
-    SOURCE  SecUiWait.cpp
-    SOURCE  SecQueryUi.cpp
-
-
-    library EUSER.LIB BAFL.LIB CONE.LIB
-    library EIKCORE.LIB EIKCOCTL.LIB
-    library avkon.lib  eikdlg.lib 
-    library etel.lib etelmm.lib
-    library eikctl.lib 
-    library ws32.lib commonengine.lib
-    library efsrv.lib 
-	LIBRARY centralrepository.lib
-	LIBRARY aknNotifierWrapper.lib
-    library customapi.lib
-    library securityclient.lib  //Security Engine
-    library apparc.lib //For starting application in secuiobsstartter
-
-   LIBRARY SCPClient.lib // SCP server
-
-#else //If GSM:
-
-
-    SOURCEPATH ../Src
+SOURCEPATH ../Src
 
-    SOURCE  ../Src/SecUi.cpp
-    SOURCE  ../Src/SecUiCodeQueryDialog.cpp
-    SOURCE  ../Src/SecUiSecuritySettings.cpp
-    SOURCE  ../Src/SecUiSecurityHandler.cpp
-    SOURCE  ../Src/SecUiCodeQueryControl.cpp
-    SOURCE  ../Src/SecUiAutoLockSettingPage.cpp
-    SOURCE  ../Src/SecUiObsStartter.cpp
-    SOURCE  ../Src/SecUiManualSecuritySettings.cpp
-    SOURCE  ../Src/SecUiSystemLock.cpp
-    SOURCE  ../Src/SecUiWait.cpp
-    SOURCE  ../Src/SecQueryUi.cpp
-
-    SOURCE  ../Src/SecUiLockObserver.cpp
-#ifdef RD_REMOTELOCK
-    SOURCE  ../Src/SecUiRemoteLockSettingPage.cpp
-#endif    
+SOURCE  ../Src/SecUi.cpp
+SOURCE  ../Src/SecUiCodeQueryDialog.cpp
+SOURCE  ../Src/SecUiSecuritySettings.cpp
+SOURCE  ../Src/SecUiSecurityHandler.cpp
+SOURCE  ../Src/SecUiAutoLockSettingPage.cpp
+SOURCE  ../Src/SecUiObsStartter.cpp
+SOURCE  ../Src/SecUiManualSecuritySettings.cpp
+SOURCE  ../Src/SecUiSystemLock.cpp
+SOURCE  ../Src/SecUiWait.cpp
+SOURCE  ../Src/SecQueryUi.cpp
 
-    library     euser.lib bafl.lib cone.lib
-    library     eikcore.lib eikcoctl.lib
-    library     avkon.lib  eikdlg.lib 
-    library     etel.lib etelmm.lib
-    library     eikctl.lib 
-    library     ws32.lib commonengine.lib
-    library     efsrv.lib 
-    library     eiksrvui.lib
-    library     customapi.lib
-    LIBRARY     starterclient.lib       //use of Starter to remove splash screen
-    library     sysutil.lib
-    library     estor.lib
-
-#ifdef RD_REMOTELOCK
-    library     rlocksettings.lib 
-#endif    
-
-
-   LIBRARY      scpclient.lib // SCP server         
-	LIBRARY centralrepository.lib
-	LIBRARY aknnotifierwrapper.lib
-#endif //__PROTOCOL_CDMA
+// library avkon.lib  eikdlg.lib 
+library     euser.lib
+library     etel.lib etelmm.lib
+library     commonengine.lib
+library     customapi.lib
+library     rlocksettings.lib 
+LIBRARY     scpclient.lib // SCP server         
+LIBRARY			centralrepository.lib
 
 // Modified by build team
 #if defined(WINSCW)