Revert "merge clients codes"

This reverts commit d72ac9911742e963d7bab19c4cc96d70a6700c22.
minor changes