added correct removal of volumes. there are some edgecases still to be fixed...