Reworked the message system to remove a class.
Removed unnecessary class
ARGH COMMITS ARE HARD