ToJSON cleanup Dani