fix messages, remove dateUtil