diff --git a/src/RecoveryServices/RecoveryServices.Backup.Models/CommonModels/PolicyRetentionObjects.cs b/src/RecoveryServices/RecoveryServices.Backup.Models/CommonModels/PolicyRetentionObjects.cs
index 721297f8204a..85bb72fb0830 100644
--- a/src/RecoveryServices/RecoveryServices.Backup.Models/CommonModels/PolicyRetentionObjects.cs
+++ b/src/RecoveryServices/RecoveryServices.Backup.Models/CommonModels/PolicyRetentionObjects.cs
@@ -220,7 +220,7 @@ public abstract class RetentionScheduleBase
 
         public virtual void Validate()
         {
-            if (RetentionTimes == null || RetentionTimes.Count == 0 || RetentionTimes.Count != 1)
+            if (RetentionTimes == null || RetentionTimes.Count != 1)
             {
                 throw new ArgumentException(Resources.InvalidRetentionTimesInPolicyException);
             }
diff --git a/src/RecoveryServices/RecoveryServices.Backup/Cmdlets/ProtectionPolicy/GetAzureRmRecoveryServicesBackupProtectionPolicy.cs b/src/RecoveryServices/RecoveryServices.Backup/Cmdlets/ProtectionPolicy/GetAzureRmRecoveryServicesBackupProtectionPolicy.cs
index d484f1cfa549..16ef411187aa 100644
--- a/src/RecoveryServices/RecoveryServices.Backup/Cmdlets/ProtectionPolicy/GetAzureRmRecoveryServicesBackupProtectionPolicy.cs
+++ b/src/RecoveryServices/RecoveryServices.Backup/Cmdlets/ProtectionPolicy/GetAzureRmRecoveryServicesBackupProtectionPolicy.cs
@@ -170,17 +170,6 @@ public override void ExecuteCmdlet()
                             ServiceClientHelpers.GetServiceClientProviderType(
                                 Models.WorkloadType.AzureFiles );
                         }
-                    else if( WorkloadType == Models.WorkloadType.AzureFiles )
-                        {
-                        if( BackupManagementType != Models.BackupManagementType.AzureStorage )
-                            {
-                            throw new ArgumentException(
-                                Resources.AzureFileUnsupportedBackupManagementTypeException );
-                            }
-                        serviceClientProviderType =
-                            ServiceClientHelpers.GetServiceClientProviderType(
-                                Models.WorkloadType.AzureFiles );
-                        }
                     else if( WorkloadType == Models.WorkloadType.MSSQL )
                         {
                         if( BackupManagementType != Models.BackupManagementType.AzureWorkload )
diff --git a/src/RecoveryServices/RecoveryServices.SiteRecovery/Models/PSFabricDetails.cs b/src/RecoveryServices/RecoveryServices.SiteRecovery/Models/PSFabricDetails.cs
index 3dd5fa78a2b4..5edd9f0a8494 100644
--- a/src/RecoveryServices/RecoveryServices.SiteRecovery/Models/PSFabricDetails.cs
+++ b/src/RecoveryServices/RecoveryServices.SiteRecovery/Models/PSFabricDetails.cs
@@ -876,7 +876,6 @@ public class ASRInMageAzureV2SpecificRPIDetails : ASRProviderSpecificRPIDetails
         /// </summary>
         public ASRInMageAzureV2SpecificRPIDetails(InMageAzureV2ReplicationDetails details)
         {
-            this.LastHeartbeat = this.LastHeartbeat;
             this.RecoveryAvailabilitySetId = details.RecoveryAvailabilitySetId;
             this.AgentVersion = details.AgentVersion;
             this.DiscoveryType = details.DiscoveryType;
diff --git a/src/RecoveryServices/RecoveryServices.SiteRecovery/ReplicationProtectedItem/StartAzureRmRecoveryServicesAsrTestFailoverJob.cs b/src/RecoveryServices/RecoveryServices.SiteRecovery/ReplicationProtectedItem/StartAzureRmRecoveryServicesAsrTestFailoverJob.cs
index 37946ea37d76..3631e3c10993 100644
--- a/src/RecoveryServices/RecoveryServices.SiteRecovery/ReplicationProtectedItem/StartAzureRmRecoveryServicesAsrTestFailoverJob.cs
+++ b/src/RecoveryServices/RecoveryServices.SiteRecovery/ReplicationProtectedItem/StartAzureRmRecoveryServicesAsrTestFailoverJob.cs
@@ -261,6 +261,7 @@ private void StartRPITestFailover()
                 }
                 else
                 {
+                    // TODO
                     new ArgumentException(
                         Resources
                             .UnsupportedDirectionForTFO); // Throw Unsupported Direction Exception
@@ -306,6 +307,7 @@ private void StartRPITestFailover()
                 }
                 else
                 {
+                    // TODO
                     // RecoveryToPrimary Direction is Invalid for InMageAzureV2.
                     new ArgumentException(Resources.InvalidDirectionForVMWareToAzure);
                 }
diff --git a/src/RecoveryServices/RecoveryServices.SiteRecovery/ReplicationProtectedItem/StartAzureRmRecoveryServicesAsrUnPlannedFailover.cs b/src/RecoveryServices/RecoveryServices.SiteRecovery/ReplicationProtectedItem/StartAzureRmRecoveryServicesAsrUnPlannedFailover.cs
index ac8304009e7e..437e41783027 100644
--- a/src/RecoveryServices/RecoveryServices.SiteRecovery/ReplicationProtectedItem/StartAzureRmRecoveryServicesAsrUnPlannedFailover.cs
+++ b/src/RecoveryServices/RecoveryServices.SiteRecovery/ReplicationProtectedItem/StartAzureRmRecoveryServicesAsrUnPlannedFailover.cs
@@ -274,6 +274,7 @@ private void InMageUnplannedFailover(UnplannedFailoverInput input)
             }
             else
             {
+                // TODO
                 // RecoveryToPrimary Direction is Invalid for InMage.
                 new ArgumentException(Resources.InvalidDirectionForAzureToVMWare);
             }
@@ -318,6 +319,7 @@ private void InMageAzureV2UnplannedFailover(UnplannedFailoverInput input)
             }
             else
             {
+                // TODO
                 // RecoveryToPrimary Direction is Invalid for InMageAzureV2.
                 new ArgumentException(Resources.InvalidDirectionForVMWareToAzure);
             }
diff --git a/src/RecoveryServices/RecoveryServices.SiteRecovery/ReplicationProtectedItem/UpdateAzureRmRecoveryServicesAsrProtectionDirection.cs b/src/RecoveryServices/RecoveryServices.SiteRecovery/ReplicationProtectedItem/UpdateAzureRmRecoveryServicesAsrProtectionDirection.cs
index cf7aaeb6698b..f35143391a1b 100644
--- a/src/RecoveryServices/RecoveryServices.SiteRecovery/ReplicationProtectedItem/UpdateAzureRmRecoveryServicesAsrProtectionDirection.cs
+++ b/src/RecoveryServices/RecoveryServices.SiteRecovery/ReplicationProtectedItem/UpdateAzureRmRecoveryServicesAsrProtectionDirection.cs
@@ -476,6 +476,7 @@ private void SetRPIReprotect()
                 }
                 else
                 {
+                    // TODO
                     // PrimaryToRecovery Direction is Invalid for InMageAzureV2.
                     new ArgumentException(Resources.InvalidDirectionForAzureToVMWare);
                 }
@@ -507,6 +508,7 @@ private void SetRPIReprotect()
                 }
                 else
                 {
+                    // TODO
                     // PrimaryToRecovery Direction is Invalid for InMage.
                     new ArgumentException(Resources.InvalidDirectionForVMWareToAzure);
                 }