20190818 citizen.stories: need a cleanup marshall