Be more explicit about volume removal

Signed-off-by: Peter Salvatore <peter@psftw.com>
Merge pull request #7786 from psftw/volume_removal

Be more explicit about volume lifecycle