--- a/backupandrestore/backuptest/burtestserver/TestSteps/src/t_teststepbackup.cpp	Tue Aug 31 16:03:15 2010 +0300
+++ b/backupandrestore/backuptest/burtestserver/TestSteps/src/t_teststepbackup.cpp	Wed Sep 01 12:20:56 2010 +0100
@@ -17,7 +17,7 @@
  @file
  @released
 */
-#include "W32STD.H" 
+
 #include "t_teststepbackup.h"
 
 namespace bur_ts
@@ -145,8 +145,6 @@
 			Log(LOG_LEVEL2, KLog3);
 			}
 		
-        _LIT(KLog31, "Checking valid registration...");
-        Log(LOG_LEVEL2, KLog31);		
 		CheckValidRegistrationL();
 		
 		_LIT(KLog4, "Saving Data Owners...");
@@ -203,13 +201,9 @@
 		BackupSystemBaseDataL();
 		BackupSystemSnapshotDataL();
 		
-		// do active backup when in partial backup mode
-		if (iIsPartial)
-		    {
-            //active
-            BackupActiveBaseDataL();
-            BackupActiveSnapshotDataL();
-		    }
+		//active
+		BackupActiveBaseDataL();
+		BackupActiveSnapshotDataL();
 		
 		//passive
 		BackupPassiveBaseDataL();
@@ -244,13 +238,9 @@
 		BackupSystemBaseDataL();
 		BackupSystemSnapshotDataL();
 		
-        // do active backup when in partial backup mode
-        if (iIsPartial)
-            {
-            //active
-            BackupActiveIncDataL();
-            BackupActiveSnapshotDataL();
-            }
+		// active
+		BackupActiveIncDataL();
+		BackupActiveSnapshotDataL();
 		
 		//passive
 		BackupPassiveIncDataL();
@@ -540,10 +530,6 @@
 			TRAPD(error,
 			for (TInt i=0; i < KRetries;)
 				{
-			  //
-			  LogWithNum(LOG_LEVEL3,_L("doActiveBackup-retryies :"), i);
-			  
-			  
 				CheckSIDStatusL(transferTypes, iTransferTypes);													
 				if (iTransferTypes.Count()) // dataowners ready
 					{
@@ -565,20 +551,7 @@
 				iFailures++;
 				_LIT(KLogNoTrans, "***Error: Some Data Owners were Not Ready or Failed to Connect");
 				Log(LOG_LEVEL3, KLogNoTrans);
-				
-				
-				//print the remenant sids
-                for( TInt kk = 0 ; kk <transferTypes.Count() ; kk++)
-                    {
-                    
-                    CSBSIDTransferType* sidType = CSBSIDTransferType::NewL(transferTypes[kk]);
-                    CleanupStack::PushL(sidType);
-                    TSecureId id = NULL;
-                    id = sidType->SecureIdL();
-                    CleanupStack::PopAndDestroy(sidType);
-                    LogWithSID(LOG_LEVEL3, _L("doActiveBackup-transferTypes, remanent SIDs : "),id.iId);
-                    }
-               	} //if
+				} //if
 			transferTypes.ResetAndDestroy();
 			
 			User::LeaveIfError(error);