remove junk
fix date