Remove generate_order from clinet