Clean up volumeDir containers

Fixes CC-193