Intermediate changes for removing all refs to JSON files.

Comitting now because I'm apparently about to 'Install the backported kernal' I have no idea what will happen.