retrofit json to reflect extractor cleanup