revert to simpler setdate
cleanup