Fix broadcast message, removed unused message classes