policy and security view seperate classes removed,