Clean out data volumes for real
Merge pull request #2263 from jbeda/clean-volumes

Clean out data volumes for real