Revert "Dealing with the clients"

This reverts commit 5915e8114a0c33afc91773f85900a3f8797d2dd2.