Removing legacy guard from policy/api