client: cleanup output types