Refactor and umount all before removing