Add changes for safe delete in policy-models

No match.