Cleanup of policy interface