I have removed/implemented the TODOs. The story we may want to add to backlog is to write tests once we have the cloud-volume-device management utility.