CLC-1373 Reduce duplication