cleanup messages, replace seconds with TimeValue as it is now automatically handled