Revert "Initial functionality for Client-Server"

This reverts commit 7ff2311919b61c897c06f161671d1a3370f70988.