HCOLL-167 more refactors statelss client