rework volume list to work in new env
Cleanup volume list code