Remove policy-driven-storage xml