diff --git a/appveyor.yml b/appveyor.yml
index 842d85536..a497b2fb6 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -21,8 +21,6 @@ environment:
     secure: 7pCVnVEKKmSU4SZN6IFqUw==
   GC_STRAVA_CLIENT_SECRET:
     secure: n3cMS1yy709xhSnTeWABMsoAIkJzy5euh3Pw4ehv0BzszJKoWkypF0cyW8RXSm3M
-  GC_TODAYSPLAN_CLIENT_SECRET:
-    secure: 7PnFB8cfahFT6LyP64eB7N1vkbwVaULpB2ORmEkn+J75zNB1xxGClFNXSHZ7kXhB
   GC_CYCLINGANALYTICS_CLIENT_SECRET:
     secure: UY+m3YypNNLUzKyGdrLw8xdCvxuQWRZi9EHS3j1ubLC4qyRL7iEVW6ubumfdh6gT
   GC_CLOUD_DB_BASIC_AUTH:
@@ -151,7 +149,6 @@ before_build:
 - ps: (Get-Content src\Core\Secrets.h) -replace '__GC_NOKIA_CLIENT_SECRET__', $env:GC_NOKIA_CLIENT_SECRET | Set-Content src\Core\Secrets.h
 - ps: (Get-Content src\Core\Secrets.h) -replace '__GC_DROPBOX_CLIENT_SECRET__', $env:GC_DROPBOX_CLIENT_SECRET | Set-Content src\Core\Secrets.h
 - ps: (Get-Content src\Core\Secrets.h) -replace '__GC_STRAVA_CLIENT_SECRET__', $env:GC_STRAVA_CLIENT_SECRET | Set-Content src\Core\Secrets.h
-- ps: (Get-Content src\Core\Secrets.h) -replace '__GC_TODAYSPLAN_CLIENT_SECRET__', $env:GC_TODAYSPLAN_CLIENT_SECRET | Set-Content src\Core\Secrets.h
 - ps: (Get-Content src\Core\Secrets.h) -replace '__GC_CYCLINGANALYTICS_CLIENT_SECRET__', $env:GC_CYCLINGANALYTICS_CLIENT_SECRET | Set-Content src\Core\Secrets.h
 - ps: (Get-Content src\Core\Secrets.h) -replace '__GC_CLOUD_DB_BASIC_AUTH__', $env:GC_CLOUD_DB_BASIC_AUTH | Set-Content src\Core\Secrets.h
 - ps: (Get-Content src\Core\Secrets.h) -replace '__GC_CLOUD_DB_APP_NAME__', $env:GC_CLOUD_DB_APP_NAME | Set-Content src\Core\Secrets.h
diff --git a/src/Cloud/TodaysPlan.cpp b/deprecated/TodaysPlan.cpp
similarity index 100%
rename from src/Cloud/TodaysPlan.cpp
rename to deprecated/TodaysPlan.cpp
diff --git a/src/Cloud/TodaysPlan.h b/deprecated/TodaysPlan.h
similarity index 100%
rename from src/Cloud/TodaysPlan.h
rename to deprecated/TodaysPlan.h
diff --git a/src/Cloud/TodaysPlanBodyMeasures.cpp b/deprecated/TodaysPlanBodyMeasures.cpp
similarity index 100%
rename from src/Cloud/TodaysPlanBodyMeasures.cpp
rename to deprecated/TodaysPlanBodyMeasures.cpp
diff --git a/src/Cloud/TodaysPlanBodyMeasures.h b/deprecated/TodaysPlanBodyMeasures.h
similarity index 100%
rename from src/Cloud/TodaysPlanBodyMeasures.h
rename to deprecated/TodaysPlanBodyMeasures.h
diff --git a/src/Charts/OverviewItems.cpp b/src/Charts/OverviewItems.cpp
index 8388e935b..fc683dbb9 100644
--- a/src/Charts/OverviewItems.cpp
+++ b/src/Charts/OverviewItems.cpp
@@ -4268,7 +4268,7 @@ static QColor FosterColors[11]={
 void
 RPErating::setValue(QString value)
 {
-    // RPE values from other sources (e.g. TodaysPlan) are "double"
+    // RPE values from other sources are "double"
     this->value = value;
     int v = qRound(value.toDouble());
     if (v <0 || v>10) {
diff --git a/src/Cloud/MeasuresDownload.cpp b/src/Cloud/MeasuresDownload.cpp
index 6c738cc95..ef860e7d1 100644
--- a/src/Cloud/MeasuresDownload.cpp
+++ b/src/Cloud/MeasuresDownload.cpp
@@ -42,11 +42,9 @@ MeasuresDownload::MeasuresDownload(Context *context, MeasuresGroup *measuresGrou
 
     QGroupBox *groupBox1 = new QGroupBox(tr("Choose the download or import source"));
     downloadWithings = new QRadioButton(tr("Withings"));
-    downloadTP = new QRadioButton(tr("Today's Plan"));
     downloadCSV = new QRadioButton(tr("Import CSV file"));
     QVBoxLayout *vbox1 = new QVBoxLayout;
     vbox1->addWidget(downloadWithings);
-    vbox1->addWidget(downloadTP);
     vbox1->addWidget(downloadCSV);
     groupBox1->setLayout(vbox1);
     mainLayout->addWidget(groupBox1);
@@ -109,14 +107,11 @@ MeasuresDownload::MeasuresDownload(Context *context, MeasuresGroup *measuresGrou
     connect(dateRangeManual, SIGNAL(toggled(bool)), this, SLOT(dateRangeManualSettingChanged(bool)));
 
     connect(downloadWithings, SIGNAL(toggled(bool)), this, SLOT(downloadWithingsSettingChanged(bool)));
-    connect(downloadTP, SIGNAL(toggled(bool)), this, SLOT(downloadTPSettingChanged(bool)));
     connect(downloadCSV, SIGNAL(toggled(bool)), this, SLOT(downloadCSVSettingChanged(bool)));
 
     // don't allow options which are not authorized
     downloadWithings->setEnabled((measuresGroup->getSymbol() == "Body") &&
         (appsettings->cvalue(context->athlete->cyclist, GC_NOKIA_TOKEN, "").toString() !=""));
-    downloadTP->setEnabled((measuresGroup->getSymbol() == "Body") &&
-        (appsettings->cvalue(context->athlete->cyclist, GC_TODAYSPLAN_TOKEN, "").toString() != ""));
 
     // select the default checked / based on available properties and last selection
     int last_selection = appsettings->cvalue(context->athlete->cyclist, GC_BM_LAST_TYPE, 0).toInt();
@@ -127,12 +122,6 @@ MeasuresDownload::MeasuresDownload(Context *context, MeasuresGroup *measuresGrou
             done = true;
         }
     }
-    if (!done && downloadTP->isEnabled()) {
-        if (last_selection == 0 || last_selection == TP) {
-            downloadTP->setChecked(true);
-            done = true;
-        }
-    }
     if (!done) {
         downloadCSV->setChecked(true);
     }
@@ -157,14 +146,9 @@ MeasuresDownload::MeasuresDownload(Context *context, MeasuresGroup *measuresGrou
 
     // initialize the downloader
     withingsDownload = new WithingsDownload(context);
-    todaysPlanBodyMeasureDownload = new TodaysPlanBodyMeasures(context);
     csvFileImport = new MeasuresCsvImport(context, this);
 
     // connect the progress bar
-    connect(todaysPlanBodyMeasureDownload, SIGNAL(downloadStarted(int)), this, SLOT(downloadProgressStart(int)));
-    connect(todaysPlanBodyMeasureDownload, SIGNAL(downloadProgress(int)), this, SLOT(downloadProgress(int)));
-    connect(todaysPlanBodyMeasureDownload, SIGNAL(downloadEnded(int)), this, SLOT(downloadProgressEnd(int)));
-
     connect(withingsDownload, SIGNAL(downloadStarted(int)), this, SLOT(downloadProgressStart(int)));
     connect(withingsDownload, SIGNAL(downloadProgress(int)), this, SLOT(downloadProgress(int)));
     connect(withingsDownload, SIGNAL(downloadEnded(int)), this, SLOT(downloadProgressEnd(int)));
@@ -177,7 +161,6 @@ MeasuresDownload::MeasuresDownload(Context *context, MeasuresGroup *measuresGrou
 MeasuresDownload::~MeasuresDownload() {
 
     delete withingsDownload;
-    delete todaysPlanBodyMeasureDownload;
     delete csvFileImport;
 
 }
@@ -241,8 +224,6 @@ MeasuresDownload::download() {
    // do the download
    if (downloadWithings->isChecked()) {
      downloadOk = withingsDownload->getBodyMeasures(err, fromDate, toDate, measures);
-   } else if (downloadTP->isChecked()) {
-     downloadOk = todaysPlanBodyMeasureDownload->getBodyMeasures(err, fromDate, toDate, measures);
    } else if (downloadCSV->isChecked()) {
        downloadOk = csvFileImport->getMeasures(measuresGroup, err, fromDate, toDate, measures);
    } else return;
@@ -326,13 +307,6 @@ MeasuresDownload::downloadWithingsSettingChanged(bool checked) {
     }
 }
 
-void
-MeasuresDownload::downloadTPSettingChanged(bool checked) {
-
-    if (checked) {
-        appsettings->setCValue(context->athlete->cyclist, GC_BM_LAST_TYPE, TP);
-    }
-}
 
 void
 MeasuresDownload::downloadCSVSettingChanged(bool checked) {
diff --git a/src/Cloud/MeasuresDownload.h b/src/Cloud/MeasuresDownload.h
index c0df8421a..92495f609 100644
--- a/src/Cloud/MeasuresDownload.h
+++ b/src/Cloud/MeasuresDownload.h
@@ -23,7 +23,6 @@
 #include "Context.h"
 
 #include "WithingsDownload.h"
-#include "TodaysPlanBodyMeasures.h"
 #include "MeasuresCsvImport.h"
 
 #include <QDialog>
@@ -53,7 +52,6 @@ private:
      MeasuresGroup *measuresGroup;
 
      WithingsDownload *withingsDownload;
-     TodaysPlanBodyMeasures *todaysPlanBodyMeasureDownload;
      MeasuresCsvImport *csvFileImport;
 
      QPushButton *downloadButton;
@@ -61,9 +59,8 @@ private:
 
      QCheckBox *discardExistingMeasures;
 
-     // withings, todaysplan, csv file
+     // withings, csv file
      QRadioButton *downloadWithings;
-     QRadioButton *downloadTP;
      QRadioButton *downloadCSV;
 
      //  all, from last measure, manual date interval
@@ -95,7 +92,6 @@ private slots:
      void dateRangeManualSettingChanged(bool);
 
      void downloadWithingsSettingChanged(bool);
-     void downloadTPSettingChanged(bool);
      void downloadCSVSettingChanged(bool);
 
      void downloadProgressStart(int);
diff --git a/src/Cloud/OAuthDialog.cpp b/src/Cloud/OAuthDialog.cpp
index efc1cd583..6cc905be1 100644
--- a/src/Cloud/OAuthDialog.cpp
+++ b/src/Cloud/OAuthDialog.cpp
@@ -44,7 +44,6 @@ OAuthDialog::OAuthDialog(Context *context, OAuthSite site, CloudService *service
         if (service->id() == "Dropbox") site = this->site = DROPBOX;
         if (service->id() == "Cycling Analytics") site = this->site = CYCLING_ANALYTICS;
         if (service->id() == "Nolio") site = this->site = NOLIO;
-        if (service->id() == "Today's Plan") site = this->site = TODAYSPLAN;
         if (service->id() == "Withings") site = this->site = WITHINGS;
         if (service->id() == "PolarFlow") site = this->site = POLAR;
         if (service->id() == "SportTracks.mobi") site = this->site = SPORTTRACKS;
@@ -125,13 +124,6 @@ OAuthDialog::OAuthDialog(Context *context, OAuthSite site, CloudService *service
         urlstr.append("response_type=code&");
         urlstr.append("approval_prompt=force");
 
-    } else if (site == TODAYSPLAN) {
-
-        //urlstr = QString("https://whats.todaysplan.com.au/en/authorize/"); //XXX fixup below when pages.cpp goes
-        if (baseURL=="") baseURL=service->getSetting(GC_TODAYSPLAN_URL, "https://whats.todaysplan.com.au").toString();
-        urlstr = QString("%1/authorize/").arg(baseURL);
-        urlstr.append(GC_TODAYSPLAN_CLIENT_ID);
-
     } else if (site == POLAR) {
 
         // OAUTH 2.0 - Polar flow for installed applications
@@ -174,7 +166,7 @@ OAuthDialog::OAuthDialog(Context *context, OAuthSite site, CloudService *service
     //
     // STEP 1: LOGIN AND AUTHORISE THE APPLICATION
     //
-    if (site == NOLIO || site == DROPBOX || site == STRAVA || site == CYCLING_ANALYTICS || site == POLAR || site == SPORTTRACKS || site == TODAYSPLAN || site == WITHINGS || site == AZUM) {
+    if (site == NOLIO || site == DROPBOX || site == STRAVA || site == CYCLING_ANALYTICS || site == POLAR || site == SPORTTRACKS || site == WITHINGS || site == AZUM) {
         url = QUrl(urlstr);
         view->setUrl(url);
         // connects
@@ -210,7 +202,7 @@ OAuthDialog::urlChanged(const QUrl &url)
     QString authheader;
 
     // sites that use this scheme
-    if (site == NOLIO || site == DROPBOX || site == STRAVA || site == CYCLING_ANALYTICS || site == TODAYSPLAN || site == POLAR || site == SPORTTRACKS || site == XERT || site == RIDEWITHGPS || site == WITHINGS || site == AZUM) {
+    if (site == NOLIO || site == DROPBOX || site == STRAVA || site == CYCLING_ANALYTICS || site == POLAR || site == SPORTTRACKS || site == XERT || site == RIDEWITHGPS || site == WITHINGS || site == AZUM) {
 
         if (url.toString().startsWith("http://www.goldencheetah.org/?state=&code=") ||
                 url.toString().contains("blank.html?code=") ||
@@ -280,23 +272,6 @@ OAuthDialog::urlChanged(const QUrl &url)
 #endif
                 params.addQueryItem("grant_type", "authorization_code");
 
-            }  else if (site == TODAYSPLAN) {
-
-                if (baseURL=="") baseURL=service->getSetting(GC_TODAYSPLAN_URL, "https://whats.todaysplan.com.au").toString();
-                urlstr = QString("%1/rest/oauth/access_token?").arg(baseURL);
-                params.addQueryItem("client_id", GC_TODAYSPLAN_CLIENT_ID);
-#ifdef GC_TODAYSPLAN_CLIENT_SECRET
-                if (clientsecret != "") //XXX get rid when pages.cpp goes
-                    params.addQueryItem("client_secret", clientsecret);
-                else if (service->getSetting(GC_TODAYSPLAN_USERKEY, "").toString() != "")
-                    params.addQueryItem("client_secret", service->getSetting(GC_TODAYSPLAN_USERKEY, "").toString());
-                else
-                    params.addQueryItem("client_secret", GC_TODAYSPLAN_CLIENT_SECRET);
-
-#endif
-                params.addQueryItem("grant_type", "authorization_code");
-                params.addQueryItem("redirect_uri", "https://goldencheetah.github.io/blank.html");
-
             } else if (site == XERT) {
 
                 urlstr = QString("https://www.xertonline.com/oauth/token");
@@ -472,13 +447,6 @@ OAuthDialog::networkRequestFinished(QNetworkReply *reply)
             QMessageBox information(QMessageBox::Information, tr("Information"), info);
             information.exec();
 
-        } else if (site == TODAYSPLAN) {
-
-            service->setSetting(GC_TODAYSPLAN_TOKEN, access_token);
-            QString info = QString(tr("Today's Plan authorization was successful."));
-            QMessageBox information(QMessageBox::Information, tr("Information"), info);
-            information.exec();
-
         } else if (site == XERT) {
 
             service->setSetting(GC_XERT_TOKEN, access_token);
diff --git a/src/Cloud/OAuthDialog.h b/src/Cloud/OAuthDialog.h
index dcd75321d..dade803ee 100644
--- a/src/Cloud/OAuthDialog.h
+++ b/src/Cloud/OAuthDialog.h
@@ -51,7 +51,6 @@ public:
         CYCLING_ANALYTICS,
         NOLIO,
         SPORTTRACKS,
-        TODAYSPLAN,
         WITHINGS,
         POLAR,
         XERT,
diff --git a/src/Core/Measures.cpp b/src/Core/Measures.cpp
index a848c2deb..da51cd398 100644
--- a/src/Core/Measures.cpp
+++ b/src/Core/Measures.cpp
@@ -60,8 +60,6 @@ Measure::getSourceDescription() const
         return tr("Manual entry");
     case Measure::Withings:
         return tr("Withings");
-    case Measure::TodaysPlan:
-        return tr("Today's Plan");
     case Measure::CSV:
         return tr("CSV Upload");
     default:
diff --git a/src/Core/Measures.h b/src/Core/Measures.h
index 27d5d4826..258ca57bb 100644
--- a/src/Core/Measures.h
+++ b/src/Core/Measures.h
@@ -31,7 +31,7 @@ class Measure {
     Q_DECLARE_TR_FUNCTIONS(Measure)
 public:
 
-    enum measuresource { Manual, Withings, TodaysPlan, CSV };
+    enum measuresource { Manual, Withings, CSV };
     typedef enum measuresource MeasureSource;
 
     enum bodymeasuretype { WeightKg = 0, FatKg = 1, MuscleKg = 2, BonesKg = 3, LeanKg = 4, FatPercent = 5 };
diff --git a/src/Core/Secrets.h b/src/Core/Secrets.h
index 256f01fdd..0d362dfa3 100644
--- a/src/Core/Secrets.h
+++ b/src/Core/Secrets.h
@@ -69,10 +69,6 @@
 #define GC_STRAVA_CLIENT_SECRET "__GC_STRAVA_CLIENT_SECRET__"
 #endif
 
-#ifndef GC_TODAYSPLAN_CLIENT_SECRET
-#define GC_TODAYSPLAN_CLIENT_SECRET "__GC_TODAYSPLAN_CLIENT_SECRET__"
-#endif
-
 #ifndef GC_CYCLINGANALYTICS_CLIENT_SECRET
 #define GC_CYCLINGANALYTICS_CLIENT_SECRET "__GC_CYCLINGANALYTICS_CLIENT_SECRET__"
 #endif
diff --git a/src/Core/Settings.h b/src/Core/Settings.h
index f16359d87..099f5b5de 100644
--- a/src/Core/Settings.h
+++ b/src/Core/Settings.h
@@ -36,9 +36,6 @@
 #define GC_UNIT_METRIC                       "Metric"
 #define GC_UNIT_IMPERIAL                     "Imperial"
 
-//Today's Plan
-#define GC_TODAYSPLAN_CLIENT_ID    "GoldenCheetah" // app id
-
 //Cycling Analytics / see also Athlete parameter
 #define GC_CYCLINGANALYTICS_CLIENT_ID    "1504958" // app id
 
@@ -389,13 +386,6 @@
 //Cycling Analytics
 #define GC_CYCLINGANALYTICS_TOKEN       "<athlete-private>cyclinganalytics_token"
 
-//Today's Plan
-#define GC_TODAYSPLAN_TOKEN             "<athlete-private>todaysplan_token"
-#define GC_TODAYSPLAN_URL               "<athlete-private>todaysplan_url"
-#define GC_TODAYSPLAN_USERKEY           "<athlete-private>todaysplan_userkey"
-#define GC_TODAYSPLAN_ATHLETE_ID        "<athlete-private>todaysplan_athlete_id"
-#define GC_TODAYSPLAN_ATHLETE_NAME      "<athlete-private>todaysplan_athlete_name"
-
 //SixCycle
 #define GC_SIXCYCLE_USER                "<athlete-private>sixcycle_user"
 #define GC_SIXCYCLE_PASS                "<athlete-private>sixcycle_pass"
diff --git a/src/Gui/MainWindow.cpp b/src/Gui/MainWindow.cpp
index 32944ca23..c56d46ec6 100644
--- a/src/Gui/MainWindow.cpp
+++ b/src/Gui/MainWindow.cpp
@@ -42,7 +42,6 @@
 #include "RideFile.h"
 #include "Settings.h"
 #include "ErgDB.h"
-#include "TodaysPlanWorkoutDownload.h"
 #include "Library.h"
 #include "LibraryParser.h"
 #include "TrainDB.h"
@@ -66,7 +65,6 @@
 #include "MergeActivityWizard.h"
 #include "GenerateHeatMapDialog.h"
 #include "BatchProcessingDialog.h"
-#include "TodaysPlan.h"
 #include "MeasuresDownload.h"
 #include "WorkoutWizard.h"
 #include "ErgDBDownloadDialog.h"
@@ -550,7 +548,6 @@ MainWindow::MainWindow(const QDir &home)
     optionsMenu->addSeparator();
     optionsMenu->addAction(tr("Create a new workout..."), this, SLOT(showWorkoutWizard()));
     optionsMenu->addAction(tr("Download workouts from ErgDB..."), this, SLOT(downloadErgDB()));
-    optionsMenu->addAction(tr("Download workouts from Today's Plan..."), this, SLOT(downloadTodaysPlanWorkouts()));
     optionsMenu->addAction(tr("Import workouts, videos, videoSyncs..."), this, SLOT(importWorkout()));
     optionsMenu->addAction(tr("Scan disk for workouts, videos, videoSyncs..."), this, SLOT(manageLibrary()));
 
@@ -2424,27 +2421,6 @@ MainWindow::downloadErgDB()
     }
 }
 
-/*----------------------------------------------------------------------
- * TodaysPlan Workouts
- *--------------------------------------------------------------------*/
-
-void
-MainWindow::downloadTodaysPlanWorkouts()
-{
-    QString workoutDir = appsettings->value(this, GC_WORKOUTDIR).toString();
-
-    QFileInfo fi(workoutDir);
-
-    if (fi.exists() && fi.isDir()) {
-        TodaysPlanWorkoutDownload *d = new TodaysPlanWorkoutDownload(currentAthleteTab->context);
-        d->exec();
-    } else{
-        QMessageBox::critical(this, tr("Workout Directory Invalid"),
-        tr("The workout directory is not configured, or the directory selected no longer exists.\n\n"
-        "Please check your preference settings."));
-    }
-}
-
 /*----------------------------------------------------------------------
  * Workout/Media Library
  *--------------------------------------------------------------------*/
diff --git a/src/Gui/MainWindow.h b/src/Gui/MainWindow.h
index 5a28471c7..7abb76764 100644
--- a/src/Gui/MainWindow.h
+++ b/src/Gui/MainWindow.h
@@ -234,7 +234,6 @@ class MainWindow : public QMainWindow
         // Training View
         void addDevice();
         void downloadErgDB();
-        void downloadTodaysPlanWorkouts();
         void manageLibrary();
         void showWorkoutWizard();
         void importWorkout();
diff --git a/src/Resources/application.qrc b/src/Resources/application.qrc
index 46bd21f8d..124e0d814 100644
--- a/src/Resources/application.qrc
+++ b/src/Resources/application.qrc
@@ -198,7 +198,6 @@
         <file>images/services/sixcycle.png</file>
         <file>images/services/sportplushealth.png</file>
         <file>images/services/strava.png</file>
-        <file>images/services/todaysplan.png</file>
         <file>images/services/trainingstagebuch.png</file>
         <file>images/services/velohero.png</file>
         <file>images/services/polarflow.png</file>
diff --git a/src/Resources/images/services/todaysplan.png b/src/Resources/images/services/todaysplan.png
deleted file mode 100644
index dcaef9534..000000000
Binary files a/src/Resources/images/services/todaysplan.png and /dev/null differ
diff --git a/src/Train/TrainSidebar.cpp b/src/Train/TrainSidebar.cpp
index 389110343..0d5a17c50 100644
--- a/src/Train/TrainSidebar.cpp
+++ b/src/Train/TrainSidebar.cpp
@@ -439,13 +439,11 @@ TrainSidebar::workoutPopup()
     QMenu menu(workoutTree);
     QAction *import = new QAction(tr("Import Workout from File"), workoutTree);
     QAction *download = new QAction(tr("Get Workouts from ErgDB"), workoutTree);
-    QAction *dlTodaysPlan = new QAction(tr("Get Workouts from Today's Plan"), workoutTree);
     QAction *wizard = new QAction(tr("Create Workout via Wizard"), workoutTree);
     QAction *scan = new QAction(tr("Scan for Workouts"), workoutTree);
 
     menu.addAction(import);
     menu.addAction(download);
-    menu.addAction(dlTodaysPlan);
     menu.addAction(wizard);
     menu.addAction(scan);
 
@@ -478,7 +476,6 @@ TrainSidebar::workoutPopup()
     connect(import, SIGNAL(triggered(void)), context->mainWindow, SLOT(importWorkout(void)));
     connect(wizard, SIGNAL(triggered(void)), context->mainWindow, SLOT(showWorkoutWizard(void)));
     connect(download, SIGNAL(triggered(void)), context->mainWindow, SLOT(downloadErgDB(void)));
-    connect(dlTodaysPlan, SIGNAL(triggered(void)), context->mainWindow, SLOT(downloadTodaysPlanWorkouts(void)));
     connect(scan, SIGNAL(triggered(void)), context->mainWindow, SLOT(manageLibrary(void)));
 
     // execute the menu
diff --git a/src/src.pro b/src/src.pro
index f8aee7e22..a90c2d198 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -554,8 +554,6 @@ SOURCES += Cloud/PolarFlow.cpp
 HEADERS += Cloud/PolarFlow.h
 SOURCES += Cloud/SportTracks.cpp
 HEADERS += Cloud/SportTracks.h
-SOURCES += Cloud/TodaysPlan.cpp
-HEADERS += Cloud/TodaysPlan.h
 SOURCES += Cloud/Nolio.cpp
 HEADERS += Cloud/Nolio.h
 
@@ -629,7 +627,7 @@ HEADERS += Charts/Aerolab.h Charts/AerolabWindow.h Charts/AllPlot.h Charts/AllPl
 
 # cloud services
 HEADERS += Cloud/CalendarDownload.h Cloud/CloudService.h \
-           Cloud/LocalFileStore.h Cloud/OAuthDialog.h Cloud/TodaysPlanBodyMeasures.h \
+           Cloud/LocalFileStore.h Cloud/OAuthDialog.h \
            Cloud/WithingsDownload.h Cloud/Strava.h Cloud/CyclingAnalytics.h Cloud/RideWithGPS.h \
            Cloud/TrainingsTageBuch.h Cloud/Selfloops.h Cloud/Velohero.h Cloud/SportsPlusHealth.h \
            Cloud/AddCloudWizard.h Cloud/Withings.h Cloud/MeasuresDownload.h Cloud/Xert.h \
@@ -700,10 +698,6 @@ HEADERS += Train/AddDeviceWizard.h Train/CalibrationData.h Train/ComputrainerCon
            Train/SpinScanPlotWindow.h Train/SpinScanPolarPlot.h Train/GarminServiceHelper.h Train/PhysicsUtility.h Train/BicycleSim.h \
            Train/PolynomialRegression.h Train/MultiRegressionizer.h
 
-greaterThan(QT_MAJOR_VERSION, 4) {
-    HEADERS += Train/TodaysPlanWorkoutDownload.h
-}
-
 HEADERS += Train/TrainBottom.h Train/TrainDB.h Train/TrainSidebar.h \
            Train/VideoLayoutParser.h Train/VideoSyncFile.h Train/WorkoutPlotWindow.h Train/WebPageWindow.h \
            Train/WorkoutWidget.h Train/WorkoutWidgetItems.h Train/WorkoutWindow.h Train/WorkoutWizard.h Train/ZwoParser.h \
@@ -732,7 +726,7 @@ SOURCES += Charts/Aerolab.cpp Charts/AerolabWindow.cpp Charts/AllPlot.cpp Charts
 
 ## Cloud Services / Web resources
 SOURCES += Cloud/CalendarDownload.cpp Cloud/CloudService.cpp \
-           Cloud/LocalFileStore.cpp Cloud/OAuthDialog.cpp Cloud/TodaysPlanBodyMeasures.cpp \
+           Cloud/LocalFileStore.cpp Cloud/OAuthDialog.cpp \
            Cloud/WithingsDownload.cpp Cloud/Strava.cpp Cloud/CyclingAnalytics.cpp Cloud/RideWithGPS.cpp \
            Cloud/TrainingsTageBuch.cpp Cloud/Selfloops.cpp Cloud/Velohero.cpp Cloud/SportsPlusHealth.cpp \
            Cloud/AddCloudWizard.cpp Cloud/Withings.cpp Cloud/MeasuresDownload.cpp Cloud/Xert.cpp \
@@ -812,10 +806,6 @@ SOURCES += Train/AddDeviceWizard.cpp Train/CalibrationData.cpp Train/Computraine
            Train/SpinScanPlotWindow.cpp Train/SpinScanPolarPlot.cpp Train/GarminServiceHelper.cpp Train/PhysicsUtility.cpp Train/BicycleSim.cpp \
            Train/PolynomialRegression.cpp
 
-greaterThan(QT_MAJOR_VERSION, 4) {
-    SOURCES  += Train/TodaysPlanWorkoutDownload.cpp
-}
-
 SOURCES += Train/TrainBottom.cpp Train/TrainDB.cpp Train/TrainSidebar.cpp \
            Train/VideoLayoutParser.cpp Train/VideoSyncFile.cpp Train/WorkoutPlotWindow.cpp Train/WebPageWindow.cpp \
            Train/WorkoutWidget.cpp Train/WorkoutWidgetItems.cpp Train/WorkoutWindow.cpp Train/WorkoutWizard.cpp Train/ZwoParser.cpp \
diff --git a/travis/linux/before_script.sh b/travis/linux/before_script.sh
index 3293bfbda..a03ac192b 100755
--- a/travis/linux/before_script.sh
+++ b/travis/linux/before_script.sh
@@ -53,7 +53,6 @@ sed -i "s/__GC_CLOUD_DB_APP_NAME__/"$GC_CLOUD_DB_APP_NAME"/" src/Core/Secrets.h
 sed -i "s/__GC_GOOGLE_DRIVE_CLIENT_ID__/"$GC_GOOGLE_DRIVE_CLIENT_ID"/" src/Core/Secrets.h
 sed -i "s/__GC_GOOGLE_DRIVE_CLIENT_SECRET__/"$GC_GOOGLE_DRIVE_CLIENT_SECRET"/" src/Core/Secrets.h
 sed -i "s/__GC_GOOGLE_DRIVE_API_KEY__/"$GC_GOOGLE_DRIVE_API_KEY"/" src/Core/Secrets.h
-sed -i "s/__GC_TODAYSPLAN_CLIENT_SECRET__/"$GC_TODAYSPLAN_CLIENT_SECRET"/" src/Core/Secrets.h
 sed -i "s/__GC_WITHINGS_CONSUMER_SECRET__/"$GC_WITHINGS_CONSUMER_SECRET"/" src/Core/Secrets.h
 sed -i "s/__GC_NOKIA_CLIENT_SECRET__/"$GC_NOKIA_CLIENT_SECRET"/" src/Core/Secrets.h
 sed -i "s/__GC_SPORTTRACKS_CLIENT_SECRET__/"$GC_SPORTTRACKS_CLIENT_SECRET"/" src/Core/Secrets.h
diff --git a/travis/osx/before_script.sh b/travis/osx/before_script.sh
index 2087e1824..a349a547e 100755
--- a/travis/osx/before_script.sh
+++ b/travis/osx/before_script.sh
@@ -78,7 +78,6 @@ sed -i "" "s/__GC_CLOUD_DB_APP_NAME__/"$GC_CLOUD_DB_APP_NAME"/" src/Core/Secrets
 sed -i "" "s/__GC_GOOGLE_DRIVE_CLIENT_ID__/"$GC_GOOGLE_DRIVE_CLIENT_ID"/" src/Core/Secrets.h
 sed -i "" "s/__GC_GOOGLE_DRIVE_CLIENT_SECRET__/"$GC_GOOGLE_DRIVE_CLIENT_SECRET"/" src/Core/Secrets.h
 sed -i "" "s/__GC_GOOGLE_DRIVE_API_KEY__/"$GC_GOOGLE_DRIVE_API_KEY"/" src/Core/Secrets.h
-sed -i "" "s/__GC_TODAYSPLAN_CLIENT_SECRET__/"$GC_TODAYSPLAN_CLIENT_SECRET"/" src/Core/Secrets.h
 sed -i "" "s/__GC_WITHINGS_CONSUMER_SECRET__/"$GC_WITHINGS_CONSUMER_SECRET"/" src/Core/Secrets.h
 sed -i "" "s/__GC_NOKIA_CLIENT_SECRET__/"$GC_NOKIA_CLIENT_SECRET"/" src/Core/Secrets.h
 sed -i "" "s/__GC_SPORTTRACKS_CLIENT_SECRET__/"$GC_SPORTTRACKS_CLIENT_SECRET"/" src/Core/Secrets.h