Restructured the message format, and removed old messages that were not being used