refactor to use functions migrated to diskops