Cleanups for jsonschema stuff