client simplifications
Merge pull request #1 from arnaud-lb/client-simplification

client simplifications