DAR-2106 | more cleanup