Fix policy permitted attributes
Remove policy checks