moved some code to policies
Merge remote-tracking branch 'origin/master'
removed the policy checks from the management