Added a todo comment as recommended in PR 1708
removed unnecessary to_json calls as suggested in PR 1708