Messy but ongoing development of json removal ...