Merge "Remove Policy dependencies"