clean up
clean up toDate handler