diff --git a/MessageClient.cpp b/MessageClient.cpp
index 587b7bac..9c7de017 100644
--- a/MessageClient.cpp
+++ b/MessageClient.cpp
@@ -35,15 +35,9 @@ public:
 
   // Constructor
 
-  impl(QString   const & id,
-       QString   const & version,
-       QString   const & revision,
-       port_type const   server_port,
-       MessageClient   * self)
+  impl(port_type const server_port,
+       MessageClient * self)
     : self_            {self}
-    , id_              {id}
-    , version_         {version}
-    , revision_        {revision}
     , server_port_     {server_port}
     , heartbeat_timer_ {new QTimer {this}}
   {
@@ -274,18 +268,11 @@ public:
 
 #include "MessageClient.moc"
 
-MessageClient::MessageClient(QString   const & id,
-                             QString   const & version,
-                             QString   const & revision,
-                             QString   const & server,
+MessageClient::MessageClient(QString   const & server,
                              port_type const   server_port,
                              QObject         * self)
   : QObject {self}
-  , m_      {id,
-             version,
-             revision,
-             server_port,
-             this}
+  , m_      {server_port, this}
 {
   connect(&*m_, &impl::errorOccurred,[this](impl::SocketError e)
   {
diff --git a/MessageClient.hpp b/MessageClient.hpp
index 9af08bcb..4a88a2be 100644
--- a/MessageClient.hpp
+++ b/MessageClient.hpp
@@ -1,11 +1,11 @@
 #ifndef MESSAGE_CLIENT_HPP__
 #define MESSAGE_CLIENT_HPP__
 
-#include <QObject>
-#include <QTime>
 #include <QDataStream>
 #include <QDateTime>
+#include <QObject>
 #include <QString>
+#include <QTime>
 
 #include "Message.h"
 #include "Radio.hpp"
@@ -13,7 +13,6 @@
 
 class QByteArray;
 class QHostAddress;
-class QColor;
 
 //
 // MessageClient - Manage messages sent and replies received from a
@@ -34,9 +33,8 @@ public:
 
   // instantiate and initiate a host lookup on the server
   //
-  // messages will be silently dropped until a server host lookup is complete
-  MessageClient (QString const& id, QString const& version, QString const& revision,
-                 QString const& server, port_type server_port, QObject * parent = nullptr);
+  // messages will be queued until a server host lookup is complete
+  MessageClient (QString const& server, port_type server_port, QObject * parent = nullptr);
 
   // query server details
   QHostAddress server_address () const;
diff --git a/mainwindow.cpp b/mainwindow.cpp
index b42ac5d3..0de0dfe0 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -411,14 +411,11 @@ MainWindow::MainWindow(QDir const& temp_directory, bool multiple,
   m_block_pwr_tooltip {false},
   m_PwrBandSetOK {true},
   m_lastMonitoredFrequency {Default::DIAL_FREQUENCY},
-  m_messageClient {new MessageClient {QApplication::applicationName (),
-        version (), revision (),
-        m_config.udp_server_name (), m_config.udp_server_port (),
-        this}},
-  m_messageServer { new MessageServer() },
-  m_n3fjpClient { new TCPClient{this}},
+  m_messageClient {new MessageClient {m_config.udp_server_name(), m_config.udp_server_port(), this}},
+  m_messageServer {new MessageServer()},
+  m_n3fjpClient {new TCPClient{this}},
   m_psk_Reporter {&m_config, QString {"JS8Call v" + version() }.simplified ()},     // UR
-  m_spotClient { new SpotClient{m_messageClient, this}},
+  m_spotClient {new SpotClient{m_messageClient, this}},
   m_aprsClient {new APRSISClient{"rotate.aprs2.net", 14580}},
   m_manual {&m_network_manager}
 {