VOLDEV-56 Code cleanup