messages don't need to be aggregates any more
Post big edit cleanup of the files