diff --git a/openlp/core/lib/plugin.py b/openlp/core/lib/plugin.py
index 8a54f08f0..05b4164bf 100644
--- a/openlp/core/lib/plugin.py
+++ b/openlp/core/lib/plugin.py
@@ -288,13 +288,7 @@ class Plugin(QtCore.QObject, RegistryProperties):
         """
         Perform tasks on application startup
         """
-        # FIXME: Remove after 2.2 release.
-        # This is needed to load the list of media/presentation from the config saved before the settings rewrite.
-        if self.media_item_class is not None and self.name != 'images':
-            loaded_list = Settings().get_files_from_config(self)
-            # Now save the list to the config using our Settings class.
-            if loaded_list:
-                Settings().setValue('%s/%s files' % (self.settings_section, self.name), loaded_list)
+        pass
 
     def uses_theme(self, theme):
         """
diff --git a/openlp/core/lib/serviceitem.py b/openlp/core/lib/serviceitem.py
index 445eb079a..229bcd403 100644
--- a/openlp/core/lib/serviceitem.py
+++ b/openlp/core/lib/serviceitem.py
@@ -129,7 +129,7 @@ class ItemCapabilities(object):
     OnLoadUpdate = 8
     AddIfNewItem = 9
     ProvidesOwnDisplay = 10
-    HasDetailedTitleDisplay = 11
+    #HasDetailedTitleDisplay = 11
     HasVariableStartTime = 12
     CanSoftBreak = 13
     CanWordSplit = 14
@@ -415,11 +415,6 @@ class ServiceItem(RegistryProperties):
         self.will_auto_start = header.get('will_auto_start', False)
         self.processor = header.get('processor', None)
         self.has_original_files = True
-        # TODO: Remove me in 2,3 build phase
-        if self.is_capable(ItemCapabilities.HasDetailedTitleDisplay):
-            self.capabilities.remove(ItemCapabilities.HasDetailedTitleDisplay)
-            self.processor = self.title
-            self.title = None
         if 'background_audio' in header:
             self.background_audio = []
             for filename in header['background_audio']: