diff --git a/src/Applications/Applications.md b/src/Applications/Applications.md
index 0106d182061..598586b83be 100644
--- a/src/Applications/Applications.md
+++ b/src/Applications/Applications.md
@@ -31,7 +31,7 @@ directive:
     set:
       subject: $1
 #Prevent paths from being generated to allow for aliasing as a result of breaking changes in 2.18.0 and 2.17.0
-  - remove-path-by-operation: ^application_DeleteOwnerGraphBPreRef$|^application_DeleteAppManagementPolicyGraphBPreRef$|^application_DeleteTokenIssuancePolicyGraphBPreRef$|^application_DeleteTokenLifetimePolicyGraphBPreRef$|^servicePrincipal_DeleteClaimsMappingPolicyGraphBPreRef$|^servicePrincipal_DeleteHomeRealmDiscoveryPolicyGraphBPreRef$|^servicePrincipal_DeleteOwnerGraphBPreRef$|^onPremisesPublishingProfile.agentGroup.agent_DeleteAgentGroupGraphBPreRef$|^onPremisesPublishingProfile.connectorGroup_DeleteMemberGraphBPreRef$|^onPremisesPublishingProfile.connector_ListMemberGraphOPreGraphBPreRef$|^onPremisesPublishingProfile.publishedResource_DeleteAgentGroupGraphBPreRef$|^onPremisesPublishingProfile.agentGroup.publishedResource_DeleteAgentGroupGraphBPreRef$
+  - remove-path-by-operation: ^application_DeleteOwnerGraphBPreRef$|^application_DeleteAppManagementPolicyGraphBPreRef$|^application_DeleteTokenIssuancePolicyGraphBPreRef$|^application_DeleteTokenLifetimePolicyGraphBPreRef$|^servicePrincipal_DeleteClaimsMappingPolicyGraphBPreRef$|^servicePrincipal_DeleteHomeRealmDiscoveryPolicyGraphBPreRef$|^servicePrincipal_DeleteOwnerGraphBPreRef$|^onPremisesPublishingProfile.agentGroup.agent_DeleteAgentGroupGraphBPreRef$|^onPremisesPublishingProfile.connectorGroup_DeleteMemberGraphBPreRef$|^onPremisesPublishingProfile.connector_ListMemberGraphOPreGraphBPreRef$|^onPremisesPublishingProfile.publishedResource_DeleteAgentGroupGraphBPreRef$|^onPremisesPublishingProfile.agentGroup.publishedResource_DeleteAgentGroupGraphBPreRef$|
 
   # Set parameter alias
   - where:
diff --git a/src/Calendar/Calendar.md b/src/Calendar/Calendar.md
index b0a728d2365..ea078e7f97a 100644
--- a/src/Calendar/Calendar.md
+++ b/src/Calendar/Calendar.md
@@ -18,7 +18,7 @@ require:
 ``` yaml
 directive:
 # Remove paths that are not valid.
-  - remove-path-by-operation: (user|group)_(Update|Delete)Calendar$|(user|group)..*_(Get|Create|Update|Delete)CalendarView$|(user|group).(calendar).calendarView.*$|user.calendar_(Get|Update|Delete)Event$|(user|group).(calendar).event.*$|(user|group)_.*CalendarView$|(user|group).calendarView.*$|user.calendarGroup_(Get|Update|Delete)Calendar$|user.calendarGroup.calendar.*$|(group|user).event_(Create|Update|Create)Calendar$|(user|group).event.calendar.*$|placeAsRoomList.room_(Get|Update|Delete)GraphBPrePlaceId$|placeAsRoomList.workspace_(Get|Update|Delete)GraphBPrePlaceId$
+  - remove-path-by-operation: (user|group)_(Update|Delete)Calendar$|(user|group)..*_(Get|Create|Update|Delete)CalendarView$|(user|group).(calendar).calendarView.*$|user.calendar_(Get|Update|Delete)Event$|(user|group).(calendar).event.*$|(user|group)_.*CalendarView$|(user|group).calendarView.*$|user.calendarGroup_(Get|Update|Delete)Calendar$|user.calendarGroup.calendar.*$|(group|user).event_(Create|Update|Create)Calendar$|(user|group).event.calendar.*$|placeAsRoomList.room_(Get|Update|Delete)GraphBPrePlaceId$|placeAsRoomList.workspace_(Get|Update|Delete)GraphBPrePlaceId$|
 # Rename cmdlets.
   - where:
       verb: Invoke
diff --git a/src/CloudCommunications/CloudCommunications.md b/src/CloudCommunications/CloudCommunications.md
index 75de732a401..ec5595ec7bf 100644
--- a/src/CloudCommunications/CloudCommunications.md
+++ b/src/CloudCommunications/CloudCommunications.md
@@ -18,7 +18,7 @@ require:
 ``` yaml
 directive:
 # Remove invalid paths.
-  - remove-path-by-operation: ^communication(.cloudCommunication_.*CloudCommunication|_(List|Create|Update|Delete)CallRecord|.callRecord.session_.*Segment|(_List|_Update)Call)$
+  - remove-path-by-operation: ^communication(.cloudCommunication_.*CloudCommunication|_(List|Create|Update|Delete)CallRecord|.callRecord.session_.*Segment|(_List|_Update)Call)$|
 # Rename cmdlets
   - where:
       verb: Invoke
diff --git a/src/CrossDeviceExperiences/CrossDeviceExperiences.md b/src/CrossDeviceExperiences/CrossDeviceExperiences.md
index a966f8dc010..c400a11237c 100644
--- a/src/CrossDeviceExperiences/CrossDeviceExperiences.md
+++ b/src/CrossDeviceExperiences/CrossDeviceExperiences.md
@@ -19,5 +19,5 @@ require:
 # Directives go here!
 directive:
 #Prevent cmdlets with the below operation Ids from being generated to allow for aliasing as a result of breaking changes in 2.18.0 and 2.17.0.
-  - remove-path-by-operation: ^user.device_DeleteRegisteredOwnerGraphBPreRef$|^user.device_DeleteRegisteredUserGraphBPreRef$
+  - remove-path-by-operation: ^user.device_DeleteRegisteredOwnerGraphBPreRef$|^user.device_DeleteRegisteredUserGraphBPreRef$|
 ```
diff --git a/src/DeviceManagement.Actions/DeviceManagement.Actions.md b/src/DeviceManagement.Actions/DeviceManagement.Actions.md
index 6057d0c4e5c..8e57d4fc2ce 100644
--- a/src/DeviceManagement.Actions/DeviceManagement.Actions.md
+++ b/src/DeviceManagement.Actions/DeviceManagement.Actions.md
@@ -18,7 +18,7 @@ require:
 ``` yaml
 directive:
 # Remove invalid paths that exceed Windows file name limit.
-  - remove-path-by-operation: ^deviceManagement.(userExperienceAnalyticsDeviceScope_.*|reusablePolicySetting.referencingConfigurationPolicy_(assign|createCopy)|deviceShellScript.userRunState.deviceRunState.managedDevice_.*|windowsAutopilotDeploymentProfile.(assignedDevice_updateDeviceProperty|assignedDevice.deploymentProfile_assign|assignedDevice.intendedDeploymentProfile_assign|assignedDevice_assignResourceAccountToDevice|assignedDevice_unassignResourceAccountFromDevice)|deviceComplianceScript.deviceRunState.managedDevice_.*|deviceCustomAttributeShellScript.(deviceRunState.managedDevice_.*|userRunState.deviceRunState.managedDevice_.*)|deviceManagementScript.deviceRunState.managedDevice(_updateWindowsDeviceAccount|_logoutSharedAppleDeviceActiveUser|_deleteUserFromSharedAppleDevice|_createDeviceLogCollectionRequest|_sendCustomNotificationToCompanyPortal|_triggerConfigurationManagerAction)|deviceManagementScript.userRunState.deviceRunState.managedDevice_.*|deviceConfiguration.groupAssignment.deviceConfiguration(_assignedAccessMultiModeProfile|_windowsPrivacyAccessControl)|deviceHealthScript.deviceRunState.managedDevice(_sendCustomNotificationToCompanyPortal|_createDeviceLogCollectionRequest)|deviceShellScript.deviceRunState.managedDevice_sendCustomNotificationToCompanyPortal)|deviceManagement.microsoftTunnelSite.microsoftTunnelServer_generateServerLogCollectionRequest$|deviceManagement.reusablePolicySetting.referencingConfigurationPolicy_clearEnrollmentTimeDeviceMembershipTarget$|deviceManagement.reusablePolicySetting.referencingConfigurationPolicy_retrieveEnrollmentTimeDeviceMembershipTarget$|deviceManagement.reusablePolicySetting.referencingConfigurationPolicy_setEnrollmentTimeDeviceMembershipTarget$
+  - remove-path-by-operation: ^deviceManagement.(userExperienceAnalyticsDeviceScope_.*|reusablePolicySetting.referencingConfigurationPolicy_(assign|createCopy)|deviceShellScript.userRunState.deviceRunState.managedDevice_.*|windowsAutopilotDeploymentProfile.(assignedDevice_updateDeviceProperty|assignedDevice.deploymentProfile_assign|assignedDevice.intendedDeploymentProfile_assign|assignedDevice_assignResourceAccountToDevice|assignedDevice_unassignResourceAccountFromDevice)|deviceComplianceScript.deviceRunState.managedDevice_.*|deviceCustomAttributeShellScript.(deviceRunState.managedDevice_.*|userRunState.deviceRunState.managedDevice_.*)|deviceManagementScript.deviceRunState.managedDevice(_updateWindowsDeviceAccount|_logoutSharedAppleDeviceActiveUser|_deleteUserFromSharedAppleDevice|_createDeviceLogCollectionRequest|_sendCustomNotificationToCompanyPortal|_triggerConfigurationManagerAction)|deviceManagementScript.userRunState.deviceRunState.managedDevice_.*|deviceConfiguration.groupAssignment.deviceConfiguration(_assignedAccessMultiModeProfile|_windowsPrivacyAccessControl)|deviceHealthScript.deviceRunState.managedDevice(_sendCustomNotificationToCompanyPortal|_createDeviceLogCollectionRequest)|deviceShellScript.deviceRunState.managedDevice_sendCustomNotificationToCompanyPortal)|deviceManagement.microsoftTunnelSite.microsoftTunnelServer_generateServerLogCollectionRequest$|deviceManagement.reusablePolicySetting.referencingConfigurationPolicy_clearEnrollmentTimeDeviceMembershipTarget$|deviceManagement.reusablePolicySetting.referencingConfigurationPolicy_retrieveEnrollmentTimeDeviceMembershipTarget$|deviceManagement.reusablePolicySetting.referencingConfigurationPolicy_setEnrollmentTimeDeviceMembershipTarget$|
 
 # Remove cmdlets.
   - where:
diff --git a/src/DeviceManagement.Enrollment/DeviceManagement.Enrollment.md b/src/DeviceManagement.Enrollment/DeviceManagement.Enrollment.md
index 22b36fc2f09..41753135909 100644
--- a/src/DeviceManagement.Enrollment/DeviceManagement.Enrollment.md
+++ b/src/DeviceManagement.Enrollment/DeviceManagement.Enrollment.md
@@ -18,7 +18,7 @@ require:
 ``` yaml
 directive:
 # Remove invalid paths.
-  - remove-path-by-operation: ^(deviceManagement_.*UserExperienceAnalytic.*|roleManagement\..*\.roleDefinition\.inheritsPermissionsFrom.*)$
+  - remove-path-by-operation: ^(deviceManagement_.*UserExperienceAnalytic.*|roleManagement\..*\.roleDefinition\.inheritsPermissionsFrom.*)$|
 # Remove cmdlets.
   - where:
       verb: Update
diff --git a/src/DeviceManagement/DeviceManagement.md b/src/DeviceManagement/DeviceManagement.md
index f1883345622..be880c73488 100644
--- a/src/DeviceManagement/DeviceManagement.md
+++ b/src/DeviceManagement/DeviceManagement.md
@@ -18,7 +18,7 @@ require:
 ``` yaml
 directive:
 # Remove invalid paths.
-  - remove-path-by-operation: ^deviceManagement.(deviceManagementScript.userRunState.deviceRunState_.*|groupPolicyConfiguration.definitionValue.presentationValue_.*|deviceShellScript.userRunState.deviceRunState_.*|deviceConfiguration_assignedAccessMultiModeProfile|microsoftTunnelSite.microsoftTunnelServer_createServerLogCollectionRequest|groupPolicyConfiguration_updateDefinitionValue|intent_updateSetting)$
+  - remove-path-by-operation: ^deviceManagement.(deviceManagementScript.userRunState.deviceRunState_.*|groupPolicyConfiguration.definitionValue.presentationValue_.*|deviceShellScript.userRunState.deviceRunState_.*|deviceConfiguration_assignedAccessMultiModeProfile|microsoftTunnelSite.microsoftTunnelServer_createServerLogCollectionRequest|groupPolicyConfiguration_updateDefinitionValue|intent_updateSetting)$|
 
 # Remove cmdlets.
   - where:
diff --git a/src/Devices.CloudPrint/Devices.CloudPrint.md b/src/Devices.CloudPrint/Devices.CloudPrint.md
index 59e795bea5e..1ea0a470666 100644
--- a/src/Devices.CloudPrint/Devices.CloudPrint.md
+++ b/src/Devices.CloudPrint/Devices.CloudPrint.md
@@ -17,7 +17,7 @@ require:
 
 ``` yaml
 directive:
-  - remove-path-by-operation: ^print(_.*Report|\.report.*)
+  - remove-path-by-operation: ^print(_.*Report|\.report.*)|
   - where:
       verb: New
       subject: PrintPrinter
diff --git a/src/Devices.CorporateManagement/Devices.CorporateManagement.md b/src/Devices.CorporateManagement/Devices.CorporateManagement.md
index 9180816a6ab..4f615c60f31 100644
--- a/src/Devices.CorporateManagement/Devices.CorporateManagement.md
+++ b/src/Devices.CorporateManagement/Devices.CorporateManagement.md
@@ -18,7 +18,7 @@ require:
 ``` yaml
 directive:
 # Remove paths that are too long.
-  - remove-path-by-operation: ^deviceAppManagement.wdacSupplementalPolicy.deviceStatus.*$|^deviceManagement.deviceHealthScript.deviceRunState.managedDevice_deleteUserFromSharedAppleDevice|^deviceAppManagement.mobileApp.userStatus.deviceStatus.app.microsoft.graph.iosVppApp_.*$|^deviceAppManagement.managedAppRegistration.(appliedPolicy|Intendedpolicy).microsoft.graph.*_.*$
+  - remove-path-by-operation: ^deviceAppManagement.wdacSupplementalPolicy.deviceStatus.*$|^deviceManagement.deviceHealthScript.deviceRunState.managedDevice_deleteUserFromSharedAppleDevice|^deviceAppManagement.mobileApp.userStatus.deviceStatus.app.microsoft.graph.iosVppApp_.*$|^deviceAppManagement.managedAppRegistration.(appliedPolicy|Intendedpolicy).microsoft.graph.*_.*$|
 # Rename cmdlets with duplicates in their name.
   - where:
       subject: ^(DeviceAppManagement)(\1)+
diff --git a/src/Devices.ServiceAnnouncement/Devices.ServiceAnnouncement.md b/src/Devices.ServiceAnnouncement/Devices.ServiceAnnouncement.md
index 8b1ef4c4d77..0d325ae69da 100644
--- a/src/Devices.ServiceAnnouncement/Devices.ServiceAnnouncement.md
+++ b/src/Devices.ServiceAnnouncement/Devices.ServiceAnnouncement.md
@@ -18,7 +18,7 @@ require:
 ``` yaml
 directive:
 # Remove invalid paths.
-  - remove-path-by-operation: ^admin(?!\.serviceAnnouncement).*$|^admin.serviceAnnouncement_CreateHealthOverview$|^admin.serviceAnnouncement.healthOverview_CreateIssue$|^admin.serviceAnnouncement_CreateIssue$|^admin.serviceAnnouncement_CreateMessage$|^admin.serviceAnnouncement.message_CreateAttachment$|^admin.serviceAnnouncement_DeleteHealthOverview$|^admin.serviceAnnouncement.healthOverview_DeleteIssue$|^admin.serviceAnnouncement_DeleteIssue$|^admin.serviceAnnouncement_DeleteMessage$|^admin.serviceAnnouncement.message_DeleteAttachment$|^admin.serviceAnnouncement_DeleteMessagesAttachmentsArchive$|^admin.serviceAnnouncement.message_DeleteAttachmentsContent$|^admin.serviceAnnouncement_UpdateHealthOverview$|^admin.serviceAnnouncement.healthOverview_UpdateIssue$|^admin.serviceAnnouncement_UpdateIssue$|^admin.serviceAnnouncement_UpdateMessage$|^admin.serviceAnnouncement.message_UpdateAttachment$|^admin.serviceAnnouncement_SetMessagesAttachmentsArchive$|^admin.serviceAnnouncement.message_SetAttachmentsContent$
+  - remove-path-by-operation: ^admin(?!\.serviceAnnouncement).*$|^admin.serviceAnnouncement_CreateHealthOverview$|^admin.serviceAnnouncement.healthOverview_CreateIssue$|^admin.serviceAnnouncement_CreateIssue$|^admin.serviceAnnouncement_CreateMessage$|^admin.serviceAnnouncement.message_CreateAttachment$|^admin.serviceAnnouncement_DeleteHealthOverview$|^admin.serviceAnnouncement.healthOverview_DeleteIssue$|^admin.serviceAnnouncement_DeleteIssue$|^admin.serviceAnnouncement_DeleteMessage$|^admin.serviceAnnouncement.message_DeleteAttachment$|^admin.serviceAnnouncement_DeleteMessagesAttachmentsArchive$|^admin.serviceAnnouncement.message_DeleteAttachmentsContent$|^admin.serviceAnnouncement_UpdateHealthOverview$|^admin.serviceAnnouncement.healthOverview_UpdateIssue$|^admin.serviceAnnouncement_UpdateIssue$|^admin.serviceAnnouncement_UpdateMessage$|^admin.serviceAnnouncement.message_UpdateAttachment$|^admin.serviceAnnouncement_SetMessagesAttachmentsArchive$|^admin.serviceAnnouncement.message_SetAttachmentsContent$|
 
 # Drop admin from command names.
   - where:
diff --git a/src/Education/Education.md b/src/Education/Education.md
index f288b262a06..8d3a5ec13cf 100644
--- a/src/Education/Education.md
+++ b/src/Education/Education.md
@@ -19,5 +19,5 @@ require:
 # Directives go here!
 directive:
 #Prevent cmdlets with the below operation Ids from being generated to allow for aliasing as a result of breaking changes in 2.18.0 and 2.17.0. 
-  - remove-path-by-operation: ^education.class.assignment_DeleteCategoryGraphBPreRef$|^education.class_DeleteMemberGraphBPreRef$|^education.class_DeleteTeacherGraphBPreRef$|^education.me.assignment_DeleteCategoryGraphBPreRef$|^education.school_DeleteClassGraphBPreRef$|^education.school_DeleteUserGraphBPreRef$|^education.user.assignment_DeleteCategoryGraphBPreRef$
+  - remove-path-by-operation: ^education.class.assignment_DeleteCategoryGraphBPreRef$|^education.class_DeleteMemberGraphBPreRef$|^education.class_DeleteTeacherGraphBPreRef$|^education.me.assignment_DeleteCategoryGraphBPreRef$|^education.school_DeleteClassGraphBPreRef$|^education.school_DeleteUserGraphBPreRef$|^education.user.assignment_DeleteCategoryGraphBPreRef$|
 ```
diff --git a/src/Files/Files.md b/src/Files/Files.md
index e3a54eb23af..b540538c982 100644
--- a/src/Files/Files.md
+++ b/src/Files/Files.md
@@ -17,7 +17,7 @@ require:
 
 ``` yaml
 directive:
-  - remove-path-by-operation: .*_(Create|Get|Update|Set|Delete)Activity$|.*\.activity.*$|share\..*_createLink
+  - remove-path-by-operation: .*_(Create|Get|Update|Set|Delete)Activity$|.*\.activity.*$|share\..*_createLink|
   - where:
       verb: Get
       subject: ^(Group|User)(Drive)$
diff --git a/src/Groups/Groups.md b/src/Groups/Groups.md
index b5c09560ca7..0d5b5f5ce71 100644
--- a/src/Groups/Groups.md
+++ b/src/Groups/Groups.md
@@ -18,7 +18,7 @@ require:
 ``` yaml
 directive:
 #Prevent cmdlets with the below operation Ids from being generated to allow for aliasing as a result of breaking changes in 2.18.0 and 2.17.0. The affected operation Ids starts from  group_DeleteAcceptedSenderGraphBPreRef
-  - remove-path-by-operation: group\.groupLifecyclePolicy_.*$|group_(Get|Create|Update|Delete)GroupLifecyclePolicies$|group\.team.*$|user\.joinedGroup.*$|group\.site\.onenote.*$|.*\.onenote\..*parent.*|.*\.calendarView.*|.*\.notebook\.section.*|.*\.sectionGroup\.section.*|.*\.section\.page.*|.*\.calendar\.event\..*$|.*\.event\..*$|^group_DeleteAcceptedSenderGraphBPreRef$|^group_DeleteMemberGraphBPreRef$|^group_DeleteOwnerGraphBPreRef$|^group_DeleteOwnerGraphBPreRef$|^group_DeleteRejectedSenderGraphBPreRef$
+  - remove-path-by-operation: group\.groupLifecyclePolicy_.*$|group_(Get|Create|Update|Delete)GroupLifecyclePolicies$|group\.team.*$|user\.joinedGroup.*$|group\.site\.onenote.*$|.*\.onenote\..*parent.*|.*\.calendarView.*|.*\.notebook\.section.*|.*\.sectionGroup\.section.*|.*\.section\.page.*|.*\.calendar\.event\..*$|.*\.event\..*$|^group_DeleteAcceptedSenderGraphBPreRef$|^group_DeleteMemberGraphBPreRef$|^group_DeleteOwnerGraphBPreRef$|^group_DeleteOwnerGraphBPreRef$|^group_DeleteRejectedSenderGraphBPreRef$|
   - where:
       verb: Get
       subject: ^(GroupLifecyclePolicy)$
diff --git a/src/Identity.DirectoryManagement/Identity.DirectoryManagement.md b/src/Identity.DirectoryManagement/Identity.DirectoryManagement.md
index 29d5b4a02a7..74ee068fbcc 100644
--- a/src/Identity.DirectoryManagement/Identity.DirectoryManagement.md
+++ b/src/Identity.DirectoryManagement/Identity.DirectoryManagement.md
@@ -17,7 +17,7 @@ require:
 
 ``` yaml
 directive:
-  - remove-path-by-operation: ^tenantRelationship\.managedTenant\.managementTemplateStepVersion\.deployment_changeDeploymentStatus$
+  - remove-path-by-operation: ^tenantRelationship\.managedTenant\.managementTemplateStepVersion\.deployment_changeDeploymentStatus$|
 # Remove cmdlets.
   - where:
       verb: Get
@@ -59,5 +59,5 @@ directive:
     set:
       subject: $1ItemAs$2
 ##Prevent cmdlets with the below operation Ids from being generated to allow for aliasing as a result of breaking changes in 2.18.0 and 2.17.0.
-  - remove-path-by-operation: ^device_DeleteRegisteredOwnerGraphBPreRef$|^device_DeleteRegisteredUserGraphBPreRef$|^directory.administrativeUnit_DeleteMemberGraphBPreRef$|^directoryRole_DeleteMemberGraphBPreRef$|^directory.featureRolloutPolicy_ListAppliesToGraphBPreRef$
+  - remove-path-by-operation: ^device_DeleteRegisteredOwnerGraphBPreRef$|^device_DeleteRegisteredUserGraphBPreRef$|^directory.administrativeUnit_DeleteMemberGraphBPreRef$|^directoryRole_DeleteMemberGraphBPreRef$|^directory.featureRolloutPolicy_ListAppliesToGraphBPreRef$|
 ```
diff --git a/src/Identity.Governance/Identity.Governance.md b/src/Identity.Governance/Identity.Governance.md
index bd0b83eaa58..9ccd821ccef 100644
--- a/src/Identity.Governance/Identity.Governance.md
+++ b/src/Identity.Governance/Identity.Governance.md
@@ -18,7 +18,7 @@ require:
 ``` yaml
 directive:
 #Prevent cmdlets with the below operation Ids from being generated to allow for aliasing as a result of breaking changes in 2.18.0 and 2.17.0. The affected operation Ids starts from connectedOrganization_DeleteExternalSponsorGraphBPreRef$
-  - remove-path-by-operation: ^identityGovernance_(Get|Create|Update|Set|Delete)EntitlementManagement$|^identityGovernance\.entitlementManagement(_.*AccessPackageResourceRoleScope|\.accessPackageResourceRoleScope.*|\.accessPackageAssignmentPolicy\..*|\.accessPackageAssignmentRequest\..*|\.accessPackageAssignmentResourceRole\..*|\.accessPackageAssignment\..*|\.accessPackageCatalog\..*|\.accessPackageResourceRequest\..*|\.accessPackageResource\..*|\.accessPackage\..*)|^identityGovernance\.accessReview\.definition\.instance\.decision\.instance(\.|_).*|^identityGovernance\.accessReview\.definition\.instance\.stage\.decision\..*$|^privilegedAccess.roleAssignmentRequest.(resource|roleDefinition).*$|^privilegedAccess.roleAssignment.(resource|roleDefinition).*$|^privilegedAccess.roleDefinition.(resource|roleSetting).*$|^privilegedAccess.roleSetting.(resource|roleDefinition).*$|^identityGovernance_.*LifecycleWorkflow|^identityGovernance\.lifecycleWorkflow\.deletedItem\.(workflow|run|userProcessingResult)\..*|^identityGovernance\.lifecycleWorkflow\.workflow\.run\.userProcessingResult\.taskProcessingResult.*|^identityGovernance\.lifecycleWorkflow\.workflow\.userProcessingResult\.taskProcessingResult.*|^identityGovernance_.*RoleManagementAlert$|^identityGovernance\.roleManagementAlert_refresh$|^identityGovernance\.entitlementManagement\.resourceRoleScope_.*Scope$|^identityGovernance.entitlementManagement.connectedOrganization_DeleteExternalSponsorGraphBPreRef$|^identityGovernance.entitlementManagement.connectedOrganization_DeleteInternalSponsorGraphBPreRef$
+  - remove-path-by-operation: ^identityGovernance_(Get|Create|Update|Set|Delete)EntitlementManagement$|^identityGovernance\.entitlementManagement(_.*AccessPackageResourceRoleScope|\.accessPackageResourceRoleScope.*|\.accessPackageAssignmentPolicy\..*|\.accessPackageAssignmentRequest\..*|\.accessPackageAssignmentResourceRole\..*|\.accessPackageAssignment\..*|\.accessPackageCatalog\..*|\.accessPackageResourceRequest\..*|\.accessPackageResource\..*|\.accessPackage\..*)|^identityGovernance\.accessReview\.definition\.instance\.decision\.instance(\.|_).*|^identityGovernance\.accessReview\.definition\.instance\.stage\.decision\..*$|^privilegedAccess.roleAssignmentRequest.(resource|roleDefinition).*$|^privilegedAccess.roleAssignment.(resource|roleDefinition).*$|^privilegedAccess.roleDefinition.(resource|roleSetting).*$|^privilegedAccess.roleSetting.(resource|roleDefinition).*$|^identityGovernance_.*LifecycleWorkflow|^identityGovernance\.lifecycleWorkflow\.deletedItem\.(workflow|run|userProcessingResult)\..*|^identityGovernance\.lifecycleWorkflow\.workflow\.run\.userProcessingResult\.taskProcessingResult.*|^identityGovernance\.lifecycleWorkflow\.workflow\.userProcessingResult\.taskProcessingResult.*|^identityGovernance_.*RoleManagementAlert$|^identityGovernance\.roleManagementAlert_refresh$|^identityGovernance\.entitlementManagement\.resourceRoleScope_.*Scope$|^identityGovernance.entitlementManagement.connectedOrganization_DeleteExternalSponsorGraphBPreRef$|^identityGovernance.entitlementManagement.connectedOrganization_DeleteInternalSponsorGraphBPreRef$|
 # Remove cmdlets
   - where:
       verb: Get|Remove|Set
diff --git a/src/Identity.SignIns/Identity.SignIns.md b/src/Identity.SignIns/Identity.SignIns.md
index 7919d85bb49..a3a764a8da1 100644
--- a/src/Identity.SignIns/Identity.SignIns.md
+++ b/src/Identity.SignIns/Identity.SignIns.md
@@ -18,7 +18,7 @@ require:
 ``` yaml
 directive:
 #Prevent cmdlets with the below operation Ids from being generated to allow for aliasing as a result of breaking changes in 2.18.0 and 2.17.0. The affected operation Ids starts from identity.b2xUserFlow_DeleteUserFlowIdentityProviderGraphBPreRef
-  - remove-path-by-operation: ^identity_(Get|Create|Delete|Update|List)ConditionalAcces$|^policy\.policyRoot_.*PolicyRoot|^policy_(Get|Create|Delete|Update|List)ConditionalAccessPolicy$|^invitation\.invitation_(List|Get|Update|Delete)Invitation$|^invitation_(.*)InvitedUser$|^identityProtection\.identityProtectionRoot_(.*)$|^identity\.identityContainer_(.*)$|^identityProvider(\.identityProvider.*|_.*)$|^identity.b2xUserFlow_DeleteUserFlowIdentityProviderGraphBPreRef$|^policy.featureRolloutPolicy_DeleteAppliesToGraphBPreRef$|^user.authentication.qrCodePinMethod.pin_updatePin$
+  - remove-path-by-operation: ^identity_(Get|Create|Delete|Update|List)ConditionalAcces$|^policy\.policyRoot_.*PolicyRoot|^policy_(Get|Create|Delete|Update|List)ConditionalAccessPolicy$|^invitation\.invitation_(List|Get|Update|Delete)Invitation$|^invitation_(.*)InvitedUser$|^identityProtection\.identityProtectionRoot_(.*)$|^identity\.identityContainer_(.*)$|^identityProvider(\.identityProvider.*|_.*)$|^identity.b2xUserFlow_DeleteUserFlowIdentityProviderGraphBPreRef$|^policy.featureRolloutPolicy_DeleteAppliesToGraphBPreRef$|^user.authentication.qrCodePinMethod.pin_updatePin$|
 # Remove cmdlets
   - where:
       subject: ^(Oauth2PermissionGrant)(\1)+
diff --git a/src/ManagedTenants/ManagedTenants.md b/src/ManagedTenants/ManagedTenants.md
index 8a681eef7ae..8d96b702885 100644
--- a/src/ManagedTenants/ManagedTenants.md
+++ b/src/ManagedTenants/ManagedTenants.md
@@ -17,5 +17,5 @@ require:
 
 ``` yaml
 directive:
-  - remove-path-by-operation: ^tenantRelationship_.*ManagedTenant$
+  - remove-path-by-operation: ^tenantRelationship_.*ManagedTenant$|
 ```
diff --git a/src/Notes/Notes.md b/src/Notes/Notes.md
index f69e6dfda44..0efe3bc4adc 100644
--- a/src/Notes/Notes.md
+++ b/src/Notes/Notes.md
@@ -18,7 +18,7 @@ require:
 ``` yaml
 directive:
 # Remove paths that are not valid.
-  - remove-path-by-operation: ^(user|group|site)_.*Onenote$|.*\.onenote\..*parent.*|.*\.notebook_(Get|Update|Delete)Section.*|.*\.notebook\.section.*|.*\.sectionGroup_(Get|Update|Delete)Section.*|.*\.sectionGroup\.section.*|.*\.section_(Get|Update|Delete)Page|.*\.section.page.*|.*\.onenote_(List|Create|Update|Delete)(Operation|Resource)|group\.site_.*Onenote$|group\.site\.onenote.*$|.*\.onenote\..*\.parent.*|.*\.notebook\.section.*|.*\.sectionGroup\.section.*|.*\.section\.page.*|site\..*_(Create|Get|Update|Delete)Activity$|site\..*\.activity.*|^site_(remove|add)$|^.*site\.(.*_.*SourceColumn|contentType_.*(Base|BaseType|ColumnPosition)|.*_(Get|Create|Update|Delete)Activity|.*\.activity.*
+  - remove-path-by-operation: ^(user|group|site)_.*Onenote$|.*\.onenote\..*parent.*|.*\.notebook_(Get|Update|Delete)Section.*|.*\.notebook\.section.*|.*\.sectionGroup_(Get|Update|Delete)Section.*|.*\.sectionGroup\.section.*|.*\.section_(Get|Update|Delete)Page|.*\.section.page.*|.*\.onenote_(List|Create|Update|Delete)(Operation|Resource)|group\.site_.*Onenote$|group\.site\.onenote.*$|.*\.onenote\..*\.parent.*|.*\.notebook\.section.*|.*\.sectionGroup\.section.*|.*\.section\.page.*|site\..*_(Create|Get|Update|Delete)Activity$|site\..*\.activity.*|^site_(remove|add)$|^.*site\.(.*_.*SourceColumn|contentType_.*(Base|BaseType|ColumnPosition)|.*_(Get|Create|Update|Delete)Activity|.*\.activity.*|
 # Remove invalid cmdlet
   - where:
       verb: Update
diff --git a/src/People/People.md b/src/People/People.md
index 83115a2b6f0..9216666c186 100644
--- a/src/People/People.md
+++ b/src/People/People.md
@@ -18,7 +18,7 @@ require:
 ``` yaml
 directive:
 # Remove paths that are not valid.
-  - remove-path-by-operation: ^user_(Get|Create|Update|Delete)Analytic$|^user.analytic_(Create|Update|Delete)ActivityStatistic$|^user_.*Insight$|^user.insight_(Create|Update|Delete)(Shared|Trending|Used)$
+  - remove-path-by-operation: ^user_(Get|Create|Update|Delete)Analytic$|^user.analytic_(Create|Update|Delete)ActivityStatistic$|^user_.*Insight$|^user.insight_(Create|Update|Delete)(Shared|Trending|Used)$|
 # Modify generated .cs cmdlets.
   - from: source-file-csharp
     where: $
diff --git a/src/Planner/Planner.md b/src/Planner/Planner.md
index a152150854d..d7168e5b10e 100644
--- a/src/Planner/Planner.md
+++ b/src/Planner/Planner.md
@@ -18,7 +18,7 @@ require:
 ``` yaml
 directive:
 # Remove paths that are not valid.
-  - remove-path-by-operation: ^user.planner_(Create|Update|Delete)All|planner.bucket_(Get|Create|Update|Delete)Task|planner.bucket.task.*|planner.plan_(Get|Create|Update|Delete)Bucket|planner.plan.bucket.*|planner.plan_(Get|Create|Update|Delete)Task|planner.plan.task.*$
+  - remove-path-by-operation: ^user.planner_(Create|Update|Delete)All|planner.bucket_(Get|Create|Update|Delete)Task|planner.bucket.task.*|planner.plan_(Get|Create|Update|Delete)Bucket|planner.plan.bucket.*|planner.plan_(Get|Create|Update|Delete)Task|planner.plan.task.*$|
 # Remove cmdlets
   - where:
       verb: Remove
diff --git a/src/Reports/Reports.md b/src/Reports/Reports.md
index c5dcb500064..bf10d7f9677 100644
--- a/src/Reports/Reports.md
+++ b/src/Reports/Reports.md
@@ -25,7 +25,7 @@ directive:
         description: Gets the list of Period values.
         script: "'D7', 'D30', 'D90', 'D180'"
 # Remove invalid paths.
-  - remove-path-by-operation: auditLog\.auditLogRoot.*|report.reportRoot.*|(auditLog|report)_(Create|Delete|Update).*
+  - remove-path-by-operation: auditLog\.auditLogRoot.*|report.reportRoot.*|(auditLog|report)_(Create|Delete|Update).*|
 # Remove cmdlets
   - where:
       verb: Get
diff --git a/src/Security/Security.md b/src/Security/Security.md
index b8b2caaf4ea..33ae106d416 100644
--- a/src/Security/Security.md
+++ b/src/Security/Security.md
@@ -18,7 +18,7 @@ require:
 ``` yaml
 directive:
 # Remove invalid paths.
-  - remove-path-by-operation: ^security(.case.ediscoveryCase.noncustodialDataSource_.*DataSource)$|^security_DeleteAttackSimulation$|^security_UpdateAttackSimulation$|^security_GetAttackSimulation$|^security.dataDiscovery.cloudAppDiscovery.uploadedStream_aggregatedAppsDetail$
+  - remove-path-by-operation: ^security(.case.ediscoveryCase.noncustodialDataSource_.*DataSource)$|^security_DeleteAttackSimulation$|^security_UpdateAttackSimulation$|^security_GetAttackSimulation$|^security.dataDiscovery.cloudAppDiscovery.uploadedStream_aggregatedAppsDetail$|
 # Remove cmdlets
   - where:
       verb: Get|Update
diff --git a/src/Sites/Sites.md b/src/Sites/Sites.md
index 7367a12225a..6465c6c7ea0 100644
--- a/src/Sites/Sites.md
+++ b/src/Sites/Sites.md
@@ -18,7 +18,7 @@ require:
 ``` yaml
 directive:
 # Remove invalid paths.
-  - remove-path-by-operation: group\.site_.*Onenote$|group\.site\.onenote.*$|.*\.onenote\..*\.parent.*|.*\.notebook\.section.*|.*\.sectionGroup\.section.*|.*\.section\.page.*|site\..*_(Create|Get|Update|Delete)Activity$|site\..*\.activity.*|^site_(remove|add)$|^.*site\.(.*_.*SourceColumn|contentType_.*(Base|BaseType|ColumnPosition)|.*_(Get|Create|Update|Delete)Activity|.*\.activity.*|^(user|group|site)_.*Onenote$|.*\.onenote\..*parent.*|.*\.notebook_(Get|Update|Delete)Section.*|.*\.sectionGroup_(Get|Update|Delete)Section.*|.*\.section_(Get|Update|Delete)Page|.*\.section.page.*|.*\.onenote_(List|Create|Update|Delete)(Operation|Resource)|^site_UpdatePage$
+  - remove-path-by-operation: group\.site_.*Onenote$|group\.site\.onenote.*$|.*\.onenote\..*\.parent.*|.*\.notebook\.section.*|.*\.sectionGroup\.section.*|.*\.section\.page.*|site\..*_(Create|Get|Update|Delete)Activity$|site\..*\.activity.*|^site_(remove|add)$|^.*site\.(.*_.*SourceColumn|contentType_.*(Base|BaseType|ColumnPosition)|.*_(Get|Create|Update|Delete)Activity|.*\.activity.*|^(user|group|site)_.*Onenote$|.*\.onenote\..*parent.*|.*\.notebook_(Get|Update|Delete)Section.*|.*\.sectionGroup_(Get|Update|Delete)Section.*|.*\.section_(Get|Update|Delete)Page|.*\.section.page.*|.*\.onenote_(List|Create|Update|Delete)(Operation|Resource)|^site_UpdatePage$|
 # Remove cmdlets
   - where:
       verb: Remove|New
diff --git a/src/Teams/Teams.md b/src/Teams/Teams.md
index 6397e1ad1fb..da92266948b 100644
--- a/src/Teams/Teams.md
+++ b/src/Teams/Teams.md
@@ -18,7 +18,7 @@ require:
 ``` yaml
 directive:
 # Remove invalid paths.
-  - remove-path-by-operation: ^(team_GetGroup|user\.joinedTeam.*|user_(Get|Update|Delete|Create)JoinedTeam|.*_UpdateInstalledApp)$
+  - remove-path-by-operation: ^(team_GetGroup|user\.joinedTeam.*|user_(Get|Update|Delete|Create)JoinedTeam|.*_UpdateInstalledApp)$|
 # Remove cmdlets
   - where:
       verb: Remove
diff --git a/src/Users.Actions/Users.Actions.md b/src/Users.Actions/Users.Actions.md
index bb96886a14a..fec5178bf29 100644
--- a/src/Users.Actions/Users.Actions.md
+++ b/src/Users.Actions/Users.Actions.md
@@ -18,7 +18,7 @@ require:
 ``` yaml
 directive:
 # Remove invalid paths.
-  - remove-path-by-operation: .*exceptionOccurrence.*|user\.joinedTeam.*|user\.onenote\..*.parent.*|user.*\.calendarView.*|.*\.notebook\.section.*|.*\.sectionGroup\.section.*|.*\.section\.page.*|user\.calendar\.event.*|user\.calendarGroup\.calendar.*|user\.calendar\.event.*|user\.event\.calendar\.event.*|user\.pendingAccessReviewInstance\.stage\.decision.*|user\.pendingAccessReviewInstance(\.decision|\.stage\.decision)\.instance.*
+  - remove-path-by-operation: .*exceptionOccurrence.*|user\.joinedTeam.*|user\.onenote\..*.parent.*|user.*\.calendarView.*|.*\.notebook\.section.*|.*\.sectionGroup\.section.*|.*\.section\.page.*|user\.calendar\.event.*|user\.calendarGroup\.calendar.*|user\.calendar\.event.*|user\.event\.calendar\.event.*|user\.pendingAccessReviewInstance\.stage\.decision.*|user\.pendingAccessReviewInstance(\.decision|\.stage\.decision)\.instance.*|
 # Rename All due to https://github.com/Azure/autorest.powershell/issues/1002.
   - where:
       verb: Remove
diff --git a/src/Users.Functions/Users.Functions.md b/src/Users.Functions/Users.Functions.md
index d397331ea84..fadb0ac7d18 100644
--- a/src/Users.Functions/Users.Functions.md
+++ b/src/Users.Functions/Users.Functions.md
@@ -18,7 +18,7 @@ require:
 ``` yaml
 directive:
 # Remove invalid paths.
-  - remove-path-by-operation: .*exceptionOccurrence.*|user\.joinedGroup.*|user\.joinedTeam.*|user\.onenote\..*.parent.*|user.*\.calendarView.*|.*\.notebook\.section.*|.*\.sectionGroup.section.*|.*\.section\.page.*|user\.calendar\.event\..*|user\.calendarGroup\.calendar|user\.calendar\.event\..*|user\.event\.calendar\..*|user\.pendingAccessReviewInstance\.stage\.decision.*|user\.pendingAccessReviewInstance(\.decision|\.stage\.decision)\.instance.*
+  - remove-path-by-operation: .*exceptionOccurrence.*|user\.joinedGroup.*|user\.joinedTeam.*|user\.onenote\..*.parent.*|user.*\.calendarView.*|.*\.notebook\.section.*|.*\.sectionGroup.section.*|.*\.section\.page.*|user\.calendar\.event\..*|user\.calendarGroup\.calendar|user\.calendar\.event\..*|user\.event\.calendar\..*|user\.pendingAccessReviewInstance\.stage\.decision.*|user\.pendingAccessReviewInstance(\.decision|\.stage\.decision)\.instance.*|
 # Rename cmdlets.
   - where:
       verb: Get
diff --git a/src/WindowsUpdates/WindowsUpdates.md b/src/WindowsUpdates/WindowsUpdates.md
index 57f916c542e..40aecef2b69 100644
--- a/src/WindowsUpdates/WindowsUpdates.md
+++ b/src/WindowsUpdates/WindowsUpdates.md
@@ -18,7 +18,7 @@ require:
 ``` yaml
 directive:
 # Remove invalid paths.
-  - remove-path-by-operation: ^(admin(_.*Window|.window_.*Update|.window.update.deployment_.*Audience)|admin(?!\.window).*|admin\.window\.update(\.deploymentAudience(\.|\_).*)|.*DeploymentAudience)|admin\.window\.update\.updatePolicy\.audience_updateAudience$
+  - remove-path-by-operation: ^(admin(_.*Window|.window_.*Update|.window.update.deployment_.*Audience)|admin(?!\.window).*|admin\.window\.update(\.deploymentAudience(\.|\_).*)|.*DeploymentAudience)|admin\.window\.update\.updatePolicy\.audience_updateAudience$|
 # Pluralize.
   - where:
       subject: (.*)AdminWindowUpdate(.*)