A little more volume object cleanup.
Merge pull request #233 from tsherif/volume-cleanup

A little more volume object cleanup.