diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 8d72b401b232..8280c452297b 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,12 +1,7 @@
 # @wyunchi-ms @dolauli @isra-fel are from the Azure PowerShell team. Adding them ensures they can merge the PR for those modules.
+
 # To make sure Network PRs go to the right branch, e.g. network-april
 /src/Compute/    @ookoka @haagha @audreyttt @wyunchi-ms @dolauli @isra-fel @VeryEarly @YanaXu @vidai-msft @NoriZC @notyashhh @Pan-Qi @DanielMicrosoft
-/src/PolicyInsights/  @pilor @wyunchi-ms @dolauli @isra-fel @VeryEarly @YanaXu @vidai-msft @NoriZC @notyashhh @Pan-Qi @DanielMicrosoft
-/src/Batch/ @wiboris @dpwatrous @wyunchi-ms @dolauli @isra-fel @VeryEarly @YanaXu @vidai-msft @NoriZC @notyashhh @Pan-Qi @DanielMicrosoft
-
-# Make sure Device Registry team gets notified of any DeviceRegistry PRs:
-# PRLabel: %Device Registry
-/src/DeviceRegistry/ @marcodalessandro @rohankhandelwal @riteshrao @davidemontanari @wyunchi-ms @dolauli @isra-fel @VeryEarly @YanaXu @vidai-msft @NoriZC @notyashhh @Pan-Qi @DanielMicrosoft
 
 # Make sure changes to .github folder go through our team's double check
 /.github/        @wyunchi-ms @dolauli @isra-fel @VeryEarly @YanaXu @vidai-msft @NoriZC @notyashhh @Pan-Qi @DanielMicrosoft