DAR-959: more cleanup