fix date
cleanup