Dates markup cleanup