more .def / json cleanup