more tidy up and remove old nova-volume compatibility