DAR-1184: cleanup