20190531 citizen.stories: Clean me up