Cleanup some of the cleanup code in policy_import()