Cleaned up some cruft in json-api