Remove policy dependency