delete some useless code
rework date