VOLDEV-88: cleanup