Revert "merged client"

This reverts commit 14b439cb373462fce1ed857d763f5822e4c610e4.
Revert "merged data"

This reverts commit 69a7e4d7f85b0399e494eff9a6549d23d062a6a8.