remove duplicated randomization of client id; check for empty client on clean session set false