Clean up minor things in policy-models