Removed some unnecessary uses of Policy