Refactored how volume deletion is handled