Refactor Client

+ remove redundant excluded environment check
+ cleanup methods, esp. send
+ remove redundant private
+ remove unnecessary return statements, variable assignments
This code was removed without a replacement. Is its behavior happening somewhere else? Where is that?