more on-the-fly data.json cleanups