diff --git a/plugins/feature/afc/afcworker.h b/plugins/feature/afc/afcworker.h
index f977e01c3..25eb0200e 100644
--- a/plugins/feature/afc/afcworker.h
+++ b/plugins/feature/afc/afcworker.h
@@ -174,4 +174,4 @@ private slots:
     void handleInputMessages();
 };
 
-#endif // INCLUDE_FEATURE_SIMPLEPTTWORKER_H_
+#endif // INCLUDE_FEATURE_AFCWORKER_H_
diff --git a/plugins/feature/aprs/aprswebapiadapter.cpp b/plugins/feature/aprs/aprswebapiadapter.cpp
index 9bb122fb0..ec8cff2aa 100644
--- a/plugins/feature/aprs/aprswebapiadapter.cpp
+++ b/plugins/feature/aprs/aprswebapiadapter.cpp
@@ -31,8 +31,8 @@ int APRSWebAPIAdapter::webapiSettingsGet(
         QString& errorMessage)
 {
     (void) errorMessage;
-    response.setSimplePttSettings(new SWGSDRangel::SWGSimplePTTSettings());
-    response.getSimplePttSettings()->init();
+    response.setAprsSettings(new SWGSDRangel::SWGAPRSSettings());
+    response.getAprsSettings()->init();
     APRS::webapiFormatFeatureSettings(response, m_settings);
 
     return 200;
diff --git a/plugins/feature/gs232controller/gs232controllerwebapiadapter.cpp b/plugins/feature/gs232controller/gs232controllerwebapiadapter.cpp
index b638a0060..e2c072cad 100644
--- a/plugins/feature/gs232controller/gs232controllerwebapiadapter.cpp
+++ b/plugins/feature/gs232controller/gs232controllerwebapiadapter.cpp
@@ -31,8 +31,8 @@ int GS232ControllerWebAPIAdapter::webapiSettingsGet(
         QString& errorMessage)
 {
     (void) errorMessage;
-    response.setSimplePttSettings(new SWGSDRangel::SWGSimplePTTSettings());
-    response.getSimplePttSettings()->init();
+    response.setGs232ControllerSettings(new SWGSDRangel::SWGGS232ControllerSettings());
+    response.getGs232ControllerSettings()->init();
     GS232Controller::webapiFormatFeatureSettings(response, m_settings);
 
     return 200;
diff --git a/plugins/feature/map/mapwebapiadapter.cpp b/plugins/feature/map/mapwebapiadapter.cpp
index 0ef0500b2..6ba453a47 100644
--- a/plugins/feature/map/mapwebapiadapter.cpp
+++ b/plugins/feature/map/mapwebapiadapter.cpp
@@ -31,8 +31,8 @@ int MapWebAPIAdapter::webapiSettingsGet(
         QString& errorMessage)
 {
     (void) errorMessage;
-    response.setSimplePttSettings(new SWGSDRangel::SWGSimplePTTSettings());
-    response.getSimplePttSettings()->init();
+    response.setMapSettings(new SWGSDRangel::SWGMapSettings());
+    response.getMapSettings()->init();
     Map::webapiFormatFeatureSettings(response, m_settings);
 
     return 200;
diff --git a/plugins/feature/rigctlserver/rigctlserver.cpp b/plugins/feature/rigctlserver/rigctlserver.cpp
index ef67c003f..b9cae35e5 100644
--- a/plugins/feature/rigctlserver/rigctlserver.cpp
+++ b/plugins/feature/rigctlserver/rigctlserver.cpp
@@ -24,7 +24,6 @@
 #include "SWGFeatureSettings.h"
 #include "SWGFeatureReport.h"
 #include "SWGFeatureActions.h"
-#include "SWGSimplePTTReport.h"
 #include "SWGDeviceState.h"
 
 #include "dsp/dspengine.h"
@@ -39,8 +38,7 @@ const char* const RigCtlServer::m_featureIdURI = "sdrangel.feature.rigctlserver"
 const char* const RigCtlServer::m_featureId = "RigCtlServer";
 
 RigCtlServer::RigCtlServer(WebAPIAdapterInterface *webAPIAdapterInterface) :
-    Feature(m_featureIdURI, webAPIAdapterInterface),
-    m_ptt(false)
+    Feature(m_featureIdURI, webAPIAdapterInterface)
 {
     qDebug("RigCtlServer::RigCtlServer: webAPIAdapterInterface: %p", webAPIAdapterInterface);
     setObjectName(m_featureId);
diff --git a/plugins/feature/rigctlserver/rigctlserver.h b/plugins/feature/rigctlserver/rigctlserver.h
index 40c39d10e..335846d3f 100644
--- a/plugins/feature/rigctlserver/rigctlserver.h
+++ b/plugins/feature/rigctlserver/rigctlserver.h
@@ -122,7 +122,6 @@ private:
     QThread m_thread;
     RigCtlServerWorker *m_worker;
     RigCtlServerSettings m_settings;
-    bool m_ptt;
 
     QNetworkAccessManager *m_networkManager;
     QNetworkRequest m_networkRequest;
diff --git a/plugins/feature/rigctlserver/rigctlserverwebapiadapter.cpp b/plugins/feature/rigctlserver/rigctlserverwebapiadapter.cpp
index 30cb59dee..65672cdae 100644
--- a/plugins/feature/rigctlserver/rigctlserverwebapiadapter.cpp
+++ b/plugins/feature/rigctlserver/rigctlserverwebapiadapter.cpp
@@ -31,8 +31,8 @@ int RigCtlServerWebAPIAdapter::webapiSettingsGet(
         QString& errorMessage)
 {
     (void) errorMessage;
-    response.setSimplePttSettings(new SWGSDRangel::SWGSimplePTTSettings());
-    response.getSimplePttSettings()->init();
+    response.setRigCtlServerSettings(new SWGSDRangel::SWGRigCtlServerSettings());
+    response.getRigCtlServerSettings()->init();
     RigCtlServer::webapiFormatFeatureSettings(response, m_settings);
 
     return 200;
diff --git a/plugins/feature/startracker/startracker.cpp b/plugins/feature/startracker/startracker.cpp
index c817c99ae..816b81a30 100644
--- a/plugins/feature/startracker/startracker.cpp
+++ b/plugins/feature/startracker/startracker.cpp
@@ -24,7 +24,6 @@
 #include "SWGFeatureSettings.h"
 #include "SWGFeatureReport.h"
 #include "SWGFeatureActions.h"
-#include "SWGSimplePTTReport.h"
 #include "SWGDeviceState.h"
 
 #include "dsp/dspengine.h"
@@ -39,8 +38,7 @@ const char* const StarTracker::m_featureIdURI = "sdrangel.feature.startracker";
 const char* const StarTracker::m_featureId = "StarTracker";
 
 StarTracker::StarTracker(WebAPIAdapterInterface *webAPIAdapterInterface) :
-    Feature(m_featureIdURI, webAPIAdapterInterface),
-    m_ptt(false)
+    Feature(m_featureIdURI, webAPIAdapterInterface)
 {
     qDebug("StarTracker::StarTracker: webAPIAdapterInterface: %p", webAPIAdapterInterface);
     setObjectName(m_featureId);
diff --git a/plugins/feature/startracker/startracker.h b/plugins/feature/startracker/startracker.h
index 4ad767403..38873e734 100644
--- a/plugins/feature/startracker/startracker.h
+++ b/plugins/feature/startracker/startracker.h
@@ -122,7 +122,6 @@ private:
     QThread m_thread;
     StarTrackerWorker *m_worker;
     StarTrackerSettings m_settings;
-    bool m_ptt;
 
     QNetworkAccessManager *m_networkManager;
     QNetworkRequest m_networkRequest;
diff --git a/plugins/feature/startracker/startrackerwebapiadapter.cpp b/plugins/feature/startracker/startrackerwebapiadapter.cpp
index 002c8c775..e5432afb0 100644
--- a/plugins/feature/startracker/startrackerwebapiadapter.cpp
+++ b/plugins/feature/startracker/startrackerwebapiadapter.cpp
@@ -31,8 +31,8 @@ int StarTrackerWebAPIAdapter::webapiSettingsGet(
         QString& errorMessage)
 {
     (void) errorMessage;
-    response.setSimplePttSettings(new SWGSDRangel::SWGSimplePTTSettings());
-    response.getSimplePttSettings()->init();
+    response.setStarTrackerSettings(new SWGSDRangel::SWGStarTrackerSettings());
+    response.getStarTrackerSettings()->init();
     StarTracker::webapiFormatFeatureSettings(response, m_settings);
 
     return 200;
diff --git a/plugins/feature/startracker/startrackerworker.h b/plugins/feature/startracker/startrackerworker.h
index 591b0cbd9..04e171809 100644
--- a/plugins/feature/startracker/startrackerworker.h
+++ b/plugins/feature/startracker/startrackerworker.h
@@ -90,8 +90,6 @@ private:
     void applySettings(const StarTrackerSettings& settings, bool force = false);
     void restartServer(bool enabled, uint32_t port);
     MessageQueue *getMessageQueueToGUI() { return m_msgQueueToGUI; }
-    void setAzimuth(int azimuth);
-    void setAzimuthElevation(int azimuth, int elevation);
     void updateRaDec(RADec rd, QDateTime dt);
     void writeStellariumTarget(double ra, double dec);
     void removeFromMap(QString id);
diff --git a/plugins/feature/vorlocalizer/vorlocalizer.cpp b/plugins/feature/vorlocalizer/vorlocalizer.cpp
index a01a0cc82..23ddf6c7f 100644
--- a/plugins/feature/vorlocalizer/vorlocalizer.cpp
+++ b/plugins/feature/vorlocalizer/vorlocalizer.cpp
@@ -23,7 +23,6 @@
 #include "SWGFeatureSettings.h"
 #include "SWGFeatureReport.h"
 #include "SWGFeatureActions.h"
-#include "SWGSimplePTTReport.h"
 #include "SWGDeviceState.h"
 #include "SWGChannelReport.h"
 
@@ -415,8 +414,8 @@ int VORLocalizer::webapiSettingsGet(
     QString& errorMessage)
 {
     (void) errorMessage;
-    response.setSimplePttSettings(new SWGSDRangel::SWGSimplePTTSettings());
-    response.getSimplePttSettings()->init();
+    response.setVorLocalizerSettings(new SWGSDRangel::SWGVORLocalizerSettings());
+    response.getVorLocalizerSettings()->init();
     webapiFormatFeatureSettings(response, m_settings);
     return 200;
 }
diff --git a/plugins/feature/vorlocalizer/vorlocalizerplugin.cpp b/plugins/feature/vorlocalizer/vorlocalizerplugin.cpp
index e283389cd..18b36b3f6 100644
--- a/plugins/feature/vorlocalizer/vorlocalizerplugin.cpp
+++ b/plugins/feature/vorlocalizer/vorlocalizerplugin.cpp
@@ -51,7 +51,6 @@ void VORLocalizerPlugin::initPlugin(PluginAPI* pluginAPI)
 {
 	m_pluginAPI = pluginAPI;
 
-	// register Simple PTT feature
 	m_pluginAPI->registerFeature(VORLocalizer::m_featureIdURI, VORLocalizer::m_featureId, this);
 }
 
diff --git a/plugins/feature/vorlocalizer/vorlocalizerplugin.h b/plugins/feature/vorlocalizer/vorlocalizerplugin.h
index 0d551d896..663de6bb0 100644
--- a/plugins/feature/vorlocalizer/vorlocalizerplugin.h
+++ b/plugins/feature/vorlocalizer/vorlocalizerplugin.h
@@ -15,8 +15,8 @@
 // along with this program. If not, see <http://www.gnu.org/licenses/>.          //
 ///////////////////////////////////////////////////////////////////////////////////
 
-#ifndef INCLUDE_FEATURE_SIMPLEPTTPLUGIN_H
-#define INCLUDE_FEATURE_SIMPLEPTTPLUGIN_H
+#ifndef INCLUDE_FEATURE_VORLOCALIZERPLUGIN_H
+#define INCLUDE_FEATURE_VORLOCALIZERPLUGIN_H
 
 #include <QObject>
 #include "plugin/plugininterface.h"
@@ -45,4 +45,4 @@ private:
 	PluginAPI* m_pluginAPI;
 };
 
-#endif // INCLUDE_FEATURE_SIMPLEPTTPLUGIN_H
+#endif // INCLUDE_FEATURE_VORLOCALIZERPLUGIN_H