Removed the Message classes from session and peerdiscovery