update @json to remove all uses of $__