CLDCONNECT-1162: small code cleanup