Hotfix/remove policy

Hotfix/remove policy
Shoo.