Revert "added new client id"

This reverts commit 95db9aad5489e299202601dd6d5bef65a95789a4.
new combined