Revert "Client"

This reverts commit 0a624d9b93510148e9cbdff13ae2a6134536aad5.