cleaning up json support