Revamp policy to be coninical
Clean up User pundit policies