Clean up for the JSON API work

See merge request !388
3 jobs for master
in 0 seconds, using 0 compute credits, and was queued for 0 seconds