clean data even on initial save, to prevent extra data creeping in #36