remove references to old policy mechanism [thanks @elen4]