-More spaghetti JSON cleanup.