More cleanup; ripped out get_json_queue