CLDIDE-1781: code cleanup