Simplify client generation

Merge please :)