Cleanup JSON/XML generators