cleanup and sane date default