Revert "Add CLI for client"

This reverts commit 63e6f6869ae46ee643a959ae71e1d3ce89f0df9d.
Revert "Revert "Add CLI for client""

This reverts commit 7d8bf7d7d90632f4f86bfe05baf4389515c8d631.