Guard policy clean up