Updating Client.py to remove unnecessary code..