diff -r b183ec05bd8c -r 19bba8228ff0 terminalsecurity/SCP/SCPServer/inc/SCPServer.h
--- a/terminalsecurity/SCP/SCPServer/inc/SCPServer.h	Tue Aug 31 16:04:06 2010 +0300
+++ b/terminalsecurity/SCP/SCPServer/inc/SCPServer.h	Wed Sep 01 12:27:42 2010 +0100
@@ -92,7 +92,6 @@
 _LIT8( KCodePolicyTypeId, "http://www.w3.org/2001/XMLSchema#string" );
 
 // Allowed SIDs for the functions
-const TUint32 KSCPSTIF( 0x102073E4 ); // STIF exe
 const TUint32 KSCPServerSIDTelephone( 0x100058B3 ); // Terminal Control Server
 const TUint32 KSCPServerSIDLog( 0x101f4cd5 ); // Terminal Control Server
 const TUint32 KSCPServerSIDTerminalControl( 0x10207825 ); // Terminal Control Server
@@ -137,7 +136,7 @@
         // Only Autolock allowed for the Check configuration call
         },
         {
-        _INIT_SECURITY_POLICY_S0( KSCPEvntHndlrUid ),
+        _INIT_SECURITY_POLICY_C1( ECapability_None ),
             CPolicyServer::EFailClient
         },
         {
@@ -179,7 +178,7 @@
         {
         _INIT_SECURITY_POLICY_C1( ECapability_None ),
             CPolicyServer::EFailClient        
-        }
+        }                          
     };
 #endif // SCP_ENFORCE_SECURITY
 
@@ -495,11 +494,6 @@
 		* This method is called to remove the parameters set by the application(s) provided as arguments.
 		*/
         TInt PerformCleanupL( HBufC8* aAppIDBuffer, RArray<const TParamChange>& aChangeArray, RPointerArray<HBufC8>& aParamValArray );
-        
-        /**
-        * This method returns the values for the policies maintained at the server
-        */
-        void GetPoliciesL(HBufC8* aAppIDBuffer, TUint32 aCallerIdentity);
 //#endif //  __SAP_DEVICE_LOCK_ENHANCEMENTS 
         
         // Methods from base classes
@@ -521,8 +515,6 @@
         * @param aParam The parameter passed to the timer object
         */        
         void Timeout( TAny* aParam );
-		
-        TInt ValidateLockcodeAgainstPoliciesL(TDes& aLockcode,CSCPParamObject*& aRetParams);
         
     private: //Methods