More generateOutputSchema clean-up