modified Message
created AggregatedMessages
removed unused classes