DEVIDM-115: cleanup