using cleanup, adding timestamp field handling in the style of the existing message ones