CLDIDE-2106 Code clean up