20200120 citizen.stories: Clean it up