diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp
index 125f8c07b..b5016a9a9 100644
--- a/src/MainWindow.cpp
+++ b/src/MainWindow.cpp
@@ -60,7 +60,6 @@
 #include "BatchExportDialog.h"
 #include "RideWithGPSDialog.h"
 #include "TtbDialog.h"
-#include "TwitterDialog.h"
 #include "WithingsDownload.h"
 #include "ZeoDownload.h"
 #include "CalendarDownload.h"
@@ -1347,11 +1346,6 @@ MainWindow::showTreeContextMenuPopup(const QPoint &pos)
 
         menu.addAction(actDeleteRide);
         menu.addAction(actSplitRide);
-#ifdef GC_HAVE_LIBOAUTH
-        QAction *actTweetRide = new QAction(tr("Tweet Activity"), treeWidget);
-        connect(actTweetRide, SIGNAL(triggered(void)), this, SLOT(tweetRide()));
-        menu.addAction(actTweetRide);
-#endif
 #ifdef GC_HAVE_ICAL
         QAction *actUploadCalendar = new QAction(tr("Upload Activity to Calendar"), treeWidget);
         connect(actUploadCalendar, SIGNAL(triggered(void)), this, SLOT(uploadCalendar()));
@@ -1840,21 +1834,6 @@ MainWindow::setStyle()
 #endif
 }
 
-#ifdef GC_HAVE_LIBOAUTH
-void
-MainWindow::tweetRide()
-{
-    QTreeWidgetItem *_item = treeWidget->currentItem();
-    if (_item==NULL || _item->type() != RIDE_TYPE)
-        return;
-
-    RideItem *item = dynamic_cast<RideItem*>(_item);
-    TwitterDialog *twitterDialog = new TwitterDialog(this, item);
-    twitterDialog->setWindowModality(Qt::ApplicationModal);
-    twitterDialog->exec();
-}
-#endif
-
 /*----------------------------------------------------------------------
  * Drag and Drop
  *--------------------------------------------------------------------*/
@@ -2818,10 +2797,10 @@ MainWindow::searchTextChanged(QString text)
         gcCalendar->clearFilter();
         gcMultiCalendar->clearFilter();
     } else {
-        lucene->search(text);
-        listView->searchStrings(lucene->files());
-        gcCalendar->setFilter(lucene->files());
-        gcMultiCalendar->setFilter(lucene->files());
+        athlete->lucene->search(text);
+        listView->searchStrings(athlete->lucene->files());
+        gcCalendar->setFilter(athlete->lucene->files());
+        gcMultiCalendar->setFilter(athlete->lucene->files());
     }
 #endif
 }
diff --git a/src/MainWindow.h b/src/MainWindow.h
index 4dc9c7ff7..0b9495ed3 100644
--- a/src/MainWindow.h
+++ b/src/MainWindow.h
@@ -410,9 +410,6 @@ class MainWindow : public QMainWindow
         void frontInterval();
         void backInterval();
         void intervalEdited(QTreeWidgetItem *, int);
-#ifdef GC_HAVE_LIBOAUTH
-        void tweetRide();
-#endif
 
         // working with measures, not rides
         void recordMeasure();
diff --git a/src/Pages.cpp b/src/Pages.cpp
index bed31b026..c4263114a 100644
--- a/src/Pages.cpp
+++ b/src/Pages.cpp
@@ -288,19 +288,6 @@ CredentialsPage::CredentialsPage(QWidget *parent, MainWindow *mainWindow) : QScr
     QLabel *passLabel = new QLabel(tr("Password"));
     QLabel *typeLabel = new QLabel(tr("Account Type"));
 
-    //XXX deprecated QLabel *twp = new QLabel(tr("Twitter"));
-    //XXX deprecated twp->setFont(current);
-
-    //XXX deprecated QLabel *twurlLabel = new QLabel(tr("Website"));
-    //XXX deprecated QLabel *twauthLabel = new QLabel(tr("Authorise"));
-    //XXX deprecated QLabel *twpinLabel = new QLabel(tr("PIN"));
-
-    //XXX deprecated QLabel *str = new QLabel(tr("Strava"));
-    //XXX deprecated str->setFont(current);
-
-    //XXX deprecated QLabel *struserLabel = new QLabel(tr("Username"));
-    //XXX deprecated QLabel *strpassLabel = new QLabel(tr("Password"));
-
     QLabel *rwgps = new QLabel(tr("RideWithGPS"));
     rwgps->setFont(current);
 
@@ -369,19 +356,6 @@ CredentialsPage::CredentialsPage(QWidget *parent, MainWindow *mainWindow) : QScr
 
     tpType->setCurrentIndex(appsettings->cvalue(mainWindow->athlete->cyclist, GC_TPTYPE, "0").toInt());
 
-    //XXX deprecated twitterURL = new QLineEdit(this);
-    //XXX deprecated twitterURL->setText(appsettings->cvalue(mainWindow->cyclist, GC_TWURL, "http://www.twitter.com").toString());
-    //XXX deprecated twitterAuthorise = new QPushButton("Authorise", this);
-    //XXX deprecated twitterPIN = new QLineEdit(this);
-    //XXX deprecated twitterPIN->setText("");
-
-    //XXX deprecated stravaUser = new QLineEdit(this);
-    //XXX deprecated stravaUser->setText(appsettings->cvalue(mainWindow->cyclist, GC_STRUSER, "").toString());
-
-    //XXX deprecated stravaPass = new QLineEdit(this);
-    //XXX deprecated stravaPass->setEchoMode(QLineEdit::Password);
-    //XXX deprecated stravaPass->setText(appsettings->cvalue(mainWindow->cyclist, GC_STRPASS, "").toString());
-
     rideWithGPSUser = new QLineEdit(this);
     rideWithGPSUser->setText(appsettings->cvalue(mainWindow->athlete->cyclist, GC_RWGPSUSER, "").toString());
 
@@ -476,13 +450,6 @@ CredentialsPage::CredentialsPage(QWidget *parent, MainWindow *mainWindow) : QScr
     grid->addWidget(gcUser, 7, 1, Qt::AlignLeft | Qt::AlignVCenter);
     grid->addWidget(gcPass, 8, 1, Qt::AlignLeft | Qt::AlignVCenter);
 
-    //XXX deprecated grid->addWidget(twitterURL, 10, 1, 0);
-    //XXX deprecated grid->addWidget(twitterAuthorise, 11, 1, Qt::AlignLeft | Qt::AlignVCenter);
-    //XXX deprecated grid->addWidget(twitterPIN, 12, 1, Qt::AlignLeft | Qt::AlignVCenter);
-
-    //XXX grid->addWidget(stravaUser, 14, 1, Qt::AlignLeft | Qt::AlignVCenter);
-    //XXX grid->addWidget(stravaPass, 15, 1, Qt::AlignLeft | Qt::AlignVCenter);
-
     grid->addWidget(rideWithGPSUser, 18, 1, Qt::AlignLeft | Qt::AlignVCenter);
     grid->addWidget(rideWithGPSPass, 19, 1, Qt::AlignLeft | Qt::AlignVCenter);
 
@@ -511,8 +478,6 @@ CredentialsPage::CredentialsPage(QWidget *parent, MainWindow *mainWindow) : QScr
     setFrameStyle(QFrame::NoFrame);
     setWidgetResizable(true);
     setWidget(main);
-
-    //XXX deprecated connect(twitterAuthorise, SIGNAL(clicked()), this, SLOT(authoriseTwitter()));
 }
 
 
@@ -3483,70 +3448,6 @@ MeasuresPage::saveClicked()
     RideMetadata::serialize(main->athlete->home.absolutePath() + "/measures.xml", QList<KeywordDefinition>(), current, "");
 }
 
-void CredentialsPage::authoriseTwitter()
-{
-#ifdef GC_HAVE_LIBOAUTH
-    int rc;
-    char **rv = NULL;
-    QString token;
-    QString url = QString();
-    t_key = NULL;
-    t_secret = NULL;
-
-    const char *request_token_uri = "http://api.twitter.com/oauth/request_token";
-
-    char *req_url = NULL;
-    char *postarg = NULL;
-    char *reply   = NULL;
-    req_url = oauth_sign_url2(request_token_uri, NULL, OA_HMAC, NULL, GC_TWITTER_CONSUMER_KEY, GC_TWITTER_CONSUMER_SECRET, NULL, NULL);
-    reply = oauth_http_get(req_url,postarg);
-
-    rc = oauth_split_url_parameters(reply, &rv);
-    qsort(rv, rc, sizeof(char *), oauth_cmpstringp);
-    token = QString(rv[1]);
-    t_key  =strdup(&(rv[1][12]));
-    t_secret =strdup(&(rv[2][19]));
-    url = QString("http://api.twitter.com/oauth/authorize?");
-    url.append(token);
-    QDesktopServices::openUrl(QUrl(url));
-    if(rv) free(rv);
-#endif
-}
-
-void CredentialsPage::saveTwitter()
-{
-#ifdef GC_HAVE_LIBOAUTH
-    char *reply;
-    char *req_url;
-    char **rv = NULL;
-    char *postarg = NULL;
-    QString url = QString("http://api.twitter.com/oauth/access_token?a=b&oauth_verifier=");
-
-    QString strPin = twitterPIN->text();
-    if(strPin.size() == 0)
-        return;
-
-    url.append(strPin);
-
-    req_url = oauth_sign_url2(url.toLatin1(), NULL, OA_HMAC, NULL, GC_TWITTER_CONSUMER_KEY, GC_TWITTER_CONSUMER_SECRET, t_key, t_secret);
-    reply = oauth_http_get(req_url,postarg);
-
-    int rc = oauth_split_url_parameters(reply, &rv);
-
-    if(rc ==4)
-    {
-        qsort(rv, rc, sizeof(char *), oauth_cmpstringp);
-
-        const char *oauth_token = strdup(&(rv[0][12]));
-        const char *oauth_secret = strdup(&(rv[1][19]));
-
-        //Save Twitter oauth_token and oauth_secret;
-        appsettings->setValue(GC_TWITTER_TOKEN, oauth_token);
-        appsettings->setValue(GC_TWITTER_SECRET, oauth_secret);
-    }
-#endif
-}
-
 //
 // Season Editor
 //
diff --git a/src/Pages.h b/src/Pages.h
index b8a64cf55..5e64b79e4 100644
--- a/src/Pages.h
+++ b/src/Pages.h
@@ -126,10 +126,8 @@ class CredentialsPage : public QScrollArea
     public:
         CredentialsPage(QWidget *parent, MainWindow *mainWindow);
         void saveClicked();
-        void saveTwitter();
 
     public slots:
-        void authoriseTwitter();
 
     private:
         MainWindow *mainWindow;
@@ -144,16 +142,6 @@ class CredentialsPage : public QScrollArea
         QLineEdit *gcUser;
         QLineEdit *gcPass;
 
-        QLineEdit *twitterURL; // url for twitter.com
-        QPushButton *twitterAuthorise;
-        QLineEdit *twitterPIN;
-        char *t_key, *t_secret;
-
-        QLineEdit *stravaURL; // url for strava ... http://www.strava.com
-        QPushButton *stravaTest;
-        QLineEdit *stravaUser;
-        QLineEdit *stravaPass;
-
         QLineEdit *rideWithGPSUser;
         QLineEdit *rideWithGPSPass;
 
diff --git a/src/TwitterDialog.cpp b/src/deprecated/TwitterDialog.cpp
similarity index 100%
rename from src/TwitterDialog.cpp
rename to src/deprecated/TwitterDialog.cpp
diff --git a/src/TwitterDialog.h b/src/deprecated/TwitterDialog.h
similarity index 100%
rename from src/TwitterDialog.h
rename to src/deprecated/TwitterDialog.h
diff --git a/src/src.pro b/src/src.pro
index 9f4a3b04e..8824cba17 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -22,8 +22,8 @@ LIBS += -lm $${LIBZ_LIBS}
     INCLUDEPATH += $${LIBOAUTH_INCLUDE}
     LIBS        += $${LIBOAUTH_LIBS}
     DEFINES     += GC_HAVE_LIBOAUTH
-    SOURCES     += TwitterDialog.cpp
-    HEADERS     += TwitterDialog.h
+    #SOURCES     += TwitterDialog.cpp
+    #HEADERS     += TwitterDialog.h
 }
 
 !isEmpty( D2XX_INCLUDE ) {