diff --git a/devices/actiondialog.cpp b/devices/actiondialog.cpp
index 914ddd880..fb7763f0b 100644
--- a/devices/actiondialog.cpp
+++ b/devices/actiondialog.cpp
@@ -161,15 +161,6 @@ void ActionDialog::deviceRenamed()
     }
 }
 
-void ActionDialog::showMopidyMessage()
-{
-    MessageBox::information(this, i18n("Cantata has detected that you are connected to a Mopidy server.\n\n"
-                                       "Currently it is not possible for Cantata to force Mopidy to refresh its local "
-                                       "music listing. Therefore, you will need to stop Cantata, manually refresh "
-                                       "Mopidy's database, and restart Cantata for any changes to be active."),
-                            QLatin1String("Mopidy"));
-}
-
 void ActionDialog::updateSongCountLabel()
 {
     QSet<QString> artists;
@@ -391,12 +382,6 @@ void ActionDialog::init(const QString &srcUdi, const QString &dstUdi, const QLis
     albumsWithoutRgTags.clear();
     #endif
     updateUnity(false);
-
-    if (((Remove==m && srcUdi.isEmpty()) || (Copy==m && !srcUdi.isEmpty())) && MPDConnection::self()->isMopdidy()) {
-        connect(mopidyNote, SIGNAL(leftClickedUrl()), SLOT(showMopidyMessage()));
-    } else {
-        REMOVE(mopidyNote);
-    }
 }
 
 void ActionDialog::slotButtonClicked(int button)
diff --git a/devices/actiondialog.h b/devices/actiondialog.h
index 59280fb36..64de75f0f 100644
--- a/devices/actiondialog.h
+++ b/devices/actiondialog.h
@@ -80,7 +80,6 @@ private Q_SLOTS:
     void cacheSaved();
     void controlInfoLabel();
     void deviceRenamed();
-    void showMopidyMessage();
 
 private:
     void updateSongCountLabel();
diff --git a/devices/actiondialog.ui b/devices/actiondialog.ui
index 9e01a7382..9a0cb1b0c 100644
--- a/devices/actiondialog.ui
+++ b/devices/actiondialog.ui
@@ -328,13 +328,6 @@
          </property>
         </widget>
        </item>
-       <item row="6" column="0" colspan="2">
-        <widget class="UrlNoteLabel" name="mopidyNote">
-         <property name="text">
-          <string>Connected to a Mopidy server (manual update required).</string>
-         </property>
-        </widget>
-       </item>
       </layout>
      </widget>
      <widget class="QWidget" name="page_3">
diff --git a/tags/tageditor.cpp b/tags/tageditor.cpp
index 1f47cd5ee..92264cb4e 100644
--- a/tags/tageditor.cpp
+++ b/tags/tageditor.cpp
@@ -118,14 +118,12 @@ TagEditor::TagEditor(QWidget *parent, const QList<Song> &songs,
     , writeRatingsAct(0)
 {
     iCount++;
-    bool isMopidy=false;
     bool ratingsSupport=false;
     #ifdef ENABLE_DEVICES_SUPPORT
     if (deviceUdi.isEmpty()) {
         baseDir=MPDConnection::self()->getDetails().dir;
         composerSupport=MPDConnection::self()->composerTagSupported();
         commentSupport=MPDConnection::self()->commentTagSupported();
-        isMopidy=MPDConnection::self()->isMopdidy();
         ratingsSupport=MPDConnection::self()->stickersSupported();
     } else {
         Device *dev=getDevice(udi, parentWidget());
@@ -141,7 +139,6 @@ TagEditor::TagEditor(QWidget *parent, const QList<Song> &songs,
     baseDir=MPDConnection::self()->getDetails().dir;
     composerSupport=MPDConnection::self()->composerTagSupported();
     commentSupport=MPDConnection::self()->commentTagSupported();
-    isMopidy=MPDConnection::self()->isMopdidy();
     ratingsSupport=MPDConnection::self()->stickersSupported();
     #endif
 
@@ -169,20 +166,12 @@ TagEditor::TagEditor(QWidget *parent, const QList<Song> &songs,
 
     QWidget *mainWidet = new QWidget(this);
     setupUi(mainWidet);
-    if (isMopidy) {
-        connect(mopidyNote, SIGNAL(leftClickedUrl()), SLOT(showMopidyMessage()));
-        REMOVE(ratingWidget);
-        REMOVE(ratingLabel);
-        REMOVE(ratingVarious);
-        REMOVE(ratingNoteLabel);
-    } else if (!ratingsSupport) {
-        REMOVE(mopidyNote);
+    if (!ratingsSupport) {
         REMOVE(ratingWidget);
         REMOVE(ratingLabel);
         REMOVE(ratingVarious);
         REMOVE(ratingNoteLabel);
     } else {
-        REMOVE(mopidyNote);
         connect(this, SIGNAL(getRating(QString)), MPDConnection::self(), SLOT(getRating(QString)));
         connect(this, SIGNAL(setRating(QString,quint8)), MPDConnection::self(), SLOT(setRating(QString,quint8)));
         connect(MPDConnection::self(), SIGNAL(rating(QString,quint8)), this, SLOT(rating(QString,quint8)));
@@ -211,7 +200,7 @@ TagEditor::TagEditor(QWidget *parent, const QList<Song> &songs,
     toolsMenu->addAction(i18n("Set 'Album Artist' from 'Artist'"), this, SLOT(setAlbumArtistFromArtist()));
     toolsMenu->addAction(i18n("Capitalize"), this, SLOT(capitalise()));
     toolsMenu->addAction(i18n("Adjust Track Numbers"), this, SLOT(adjustTrackNumbers()));
-    if (ratingsSupport && !isMopidy) {
+    if (ratingsSupport) {
         readRatingsAct=toolsMenu->addAction(i18n("Read Ratings from File"), this, SLOT(readRatings()));
         writeRatingsAct=toolsMenu->addAction(i18n("Write Ratings to File"), this, SLOT(writeRatings()));
         readRatingsAct->setEnabled(false);
@@ -339,7 +328,7 @@ TagEditor::TagEditor(QWidget *parent, const QList<Song> &songs,
             first=false;
         } else {
             trackName->insertItem(trackName->count(), s.filePath());
-            if (!isMopidy && ratingsSupport) {
+            if (ratingsSupport) {
                 emit getRating(s.file);
             }
         }
@@ -1002,15 +991,6 @@ void TagEditor::setIndex(int idx)
     updating=false;
 }
 
-void TagEditor::showMopidyMessage()
-{
-    MessageBox::information(this, i18n("Cantata has detected that you are connected to a Mopidy server.\n\n"
-                                       "Currently it is not possible for Cantata to force Mopidy to refresh its local "
-                                       "music listing. Therefore, you will need to stop Cantata, manually refresh "
-                                       "Mopidy's database, and restart Cantata for any changes to be active."),
-                            QLatin1String("Mopidy"));
-}
-
 void TagEditor::rating(const QString &f, quint8 r)
 {
     if (!ratingWidget) {
diff --git a/tags/tageditor.h b/tags/tageditor.h
index e2b62d509..dc7f96dad 100644
--- a/tags/tageditor.h
+++ b/tags/tageditor.h
@@ -80,7 +80,6 @@ private Q_SLOTS:
     void updateEdited(bool isFromAll=false);
     void setSong(const Song &s);
     void setIndex(int idx);
-    void showMopidyMessage();
     void rating(const QString &f, quint8 r);
     void checkRating();
 
diff --git a/tags/tageditor.ui b/tags/tageditor.ui
index b5c4fd2ed..4959044f2 100644
--- a/tags/tageditor.ui
+++ b/tags/tageditor.ui
@@ -218,13 +218,6 @@
      </property>
     </widget>
    </item>
-   <item>
-    <widget class="PlainUrlNoteLabel" name="mopidyNote">
-     <property name="text">
-      <string>Connected to a Mopidy server (manual update required).</string>
-     </property>
-    </widget>
-   </item>
    <item>
     <widget class="QProgressBar" name="progress"/>
    </item>
diff --git a/tags/trackorganiser.cpp b/tags/trackorganiser.cpp
index c233641bc..2092e8bf3 100644
--- a/tags/trackorganiser.cpp
+++ b/tags/trackorganiser.cpp
@@ -110,12 +110,10 @@ void TrackOrganiser::show(const QList<Song> &songs, const QString &udi, bool for
     }
 
     QString musicFolder;
-    bool isMopidy=false;
     #ifdef ENABLE_DEVICES_SUPPORT
     if (udi.isEmpty()) {
         musicFolder=MPDConnection::self()->getDetails().dir;
         opts.load(MPDConnectionDetails::configGroupName(MPDConnection::self()->getDetails().name), true);
-        isMopidy=MPDConnection::self()->isMopdidy();
     } else {
         deviceUdi=udi;
         Device *dev=getDevice(parentWidget());
@@ -131,7 +129,6 @@ void TrackOrganiser::show(const QList<Song> &songs, const QString &udi, bool for
     #else
     opts.load(MPDConnectionDetails::configGroupName(MPDConnection::self()->getDetails().name), true);
     musicFolder=MPDConnection::self()->getDetails().dir;
-    isMopidy=MPDConnection::self()->isMopdidy();
     #endif
     qSort(origSongs);
 
@@ -151,11 +148,6 @@ void TrackOrganiser::show(const QList<Song> &songs, const QString &udi, bool for
     if (!songsOk(origSongs, musicFolder, udi.isEmpty())) {
         return;
     }
-    if (isMopidy) {
-        connect(mopidyNote, SIGNAL(leftClickedUrl()), SLOT(showMopidyMessage()));
-    } else {
-        REMOVE(mopidyNote);
-    }
     connect(ratingsNote, SIGNAL(leftClickedUrl()), SLOT(showRatingsMessage()));
     Dialog::show();
     enableButtonOk(false);
@@ -477,15 +469,6 @@ void TrackOrganiser::removeItems()
     }
 }
 
-void TrackOrganiser::showMopidyMessage()
-{
-    MessageBox::information(this, i18n("Cantata has detected that you are connected to a Mopidy server.\n\n"
-                                       "Currently it is not possible for Cantata to force Mopidy to refresh its local "
-                                       "music listing. Therefore, you will need to stop Cantata, manually refresh "
-                                       "Mopidy's database, and restart Cantata for any changes to be active."),
-                            QLatin1String("Mopidy"));
-}
-
 void TrackOrganiser::showRatingsMessage()
 {
     MessageBox::information(this, i18n("Song ratings are not stored in the song files, but within MPD's 'sticker' database.\n\n"
diff --git a/tags/trackorganiser.h b/tags/trackorganiser.h
index 045be5bee..7bd991136 100644
--- a/tags/trackorganiser.h
+++ b/tags/trackorganiser.h
@@ -59,7 +59,6 @@ private Q_SLOTS:
     void renameFile();
     void controlRemoveAct();
     void removeItems();
-    void showMopidyMessage();
     void showRatingsMessage();
     void setFilenameScheme(const QString &text);
 
diff --git a/tags/trackorganiser.ui b/tags/trackorganiser.ui
index c156c541a..e62c73235 100644
--- a/tags/trackorganiser.ui
+++ b/tags/trackorganiser.ui
@@ -124,13 +124,6 @@
      </item>
     </layout>
    </item>
-   <item>
-    <widget class="UrlNoteLabel" name="mopidyNote">
-     <property name="text" stdset="0">
-      <string>Connected to a Mopidy server (manual update required).</string>
-     </property>
-    </widget>
-   </item>
    <item>
     <widget class="UrlNoteLabel" name="ratingsNote">
      <property name="text" stdset="0">