remove PolicyCreatorUtil, PolicyCreatorUtil from local