Cleanup deprecated Json factory
Initial commit