system.json no longer needed, key maps in machine.json