--- a/satengine/SatServer/Commands/SendUSSDCmd/src/CSendUssdHandler.cpp	Thu Aug 19 10:28:14 2010 +0300
+++ b/satengine/SatServer/Commands/SendUSSDCmd/src/CSendUssdHandler.cpp	Tue Aug 31 15:45:17 2010 +0300
@@ -16,13 +16,9 @@
 */
 
 
-#include    <CPhCltUssdSatClient.h>
-#include    <CPhCltUssd.h>
-#include    <AknGlobalNote.h>
+#include    <cphcltussdsatclient.h>
+#include	<cphcltussd.h>
 #include    <exterror.h>
-#include    <avkon.rsg>
-#include    <centralrepository.h>
-#include    <SATPrivateCRKeys.h>
 
 #include    "MSatSystemState.h"
 #include    "MSatApi.h"
@@ -568,40 +564,10 @@
     iNotificationRsp(),
     iNotificationRspPckg( iNotificationRsp ),
     // To be removed when icons are allowed in this command
-    iIconCommand( EFalse ),
-    iIsSatDisplayUssdResult( EFalse )
+    iIconCommand( EFalse )
     {
     LOG( SIMPLE,
-        "SENDUSSD: CSendUssdHandler::CSendUssdHandler calling" )
-    CRepository* repository = NULL;
-
-    TRAPD( result, repository = CRepository::NewL( KCRUidSatServer ); );
-    LOG2( NORMAL, "SENDUSSD: CSendUssdHandler::CSendUssdHandler \
-        open CRepository result: %d", result )
-
-    if ( repository && ( KErrNone == result ) )
-        {
-        result = repository->Get( KSatDisplayUssdResult, 
-        iIsSatDisplayUssdResult );
-        LOG2( NORMAL, 
-             "SENDUSSD: CSendUssdHandler::CSendUssdHandler \
-              get CRepository key iIsSatDisplayUssdResult: %d", 
-              iIsSatDisplayUssdResult )
-        
-        if ( KErrNone != result )
-            {
-            LOG2( NORMAL, 
-                 "SENDUSSD: CSendUssdHandler::CSendUssdHandler \
-                 get CRepository key error result: %d", 
-                 result )
-            }
-        }
-
-    delete repository;
-    repository = NULL;
-
-    LOG( SIMPLE,
-        "SENDUSSD: CSendUssdHandler::CSendUssdHandler exiting" )
+        "SENDUSSD: CSendUssdHandler::CSendUssdHandler calling - exiting" )
     }
 
 
@@ -629,17 +595,6 @@
 
     iSendUssdRsp.iUssdString.iUssdString.Copy( receiveMessage );
 
-    if ( ( RSat::EAlphaIdProvided != iSendUssdData.iAlphaId.iStatus )
-          && iIsSatDisplayUssdResult )
-        {
-        // if no Alpha ID provided, show the text note.
-        LOG( SIMPLE, "SENDUSSD: CSendUssdHandler::SendUssdString \
-        Show USSD result Note" )
-        TRAP_IGNORE( 
-        ShowUssdResponseNoteL( 
-        iSendUssdRsp.iUssdString.iUssdString ) );
-        }
-
     HandleSendUssdResult( error );
 
     LOG( SIMPLE, "SENDUSSD: CSendUssdHandler::SendUssdString exiting" )
@@ -716,23 +671,6 @@
     }
     
 // -----------------------------------------------------------------------------
-// Show the ussd response note.
-// -----------------------------------------------------------------------------
-//
-void CSendUssdHandler::ShowUssdResponseNoteL( const TDesC& aText )
-    {
-    LOG( SIMPLE, "SENDUSSD: CSendUssdHandler::ShowUssdResponseNoteL calling" )
-
-    CAknGlobalNote* note = CAknGlobalNote::NewLC();
-    note->SetSoftkeys( R_AVKON_SOFTKEYS_OK_EMPTY );
-    note->ShowNoteL( EAknGlobalConfirmationNote,
-        iSendUssdRsp.iUssdString.iUssdString );
-    CleanupStack::PopAndDestroy( note );
-
-    LOG( SIMPLE, "SENDUSSD: CSendUssdHandler::ShowUssdResponseNoteL exiting" )
-    }
-
-// -----------------------------------------------------------------------------
 // Handles the result of Ussd sending.
 // -----------------------------------------------------------------------------
 //
@@ -754,7 +692,6 @@
     else if ( TSatExtErrorUtils::IsExtendedError( aError ) ) // extended error
         {
         TUint8 addInfo( 0 );
-        // In subcase 2, SAT always gets KErrGsmCCCallRejected
         if ( KErrGsmCCCallRejected == aError )   
            {
            LOG( SIMPLE, 
@@ -833,8 +770,8 @@
         iSendUssdRsp.iGeneralResult = RSat::KModifiedByCallControl;
         iSendUssdRsp.iInfoType = RSat::KNoAdditionalInfo;
         iSendUssdRsp.iAdditionalInfo.SetLength( 0 );
-        iSendUssdRsp.iAdditionalInfo.Zero(); 
-        }
+        iSendUssdRsp.iAdditionalInfo.Zero();
+		}
     else if ( KErrNone == aError )   //  Success case
         {
         LOG( SIMPLE,