Clean storage policy types

Resolves: https://www.pivotaltracker.com/story/show/78821118