Updated comments in client and removed some precondition checks