Merge "Removed unused code from GuardPolicyDelegate and GuardPolicyDeleteDelegate"