diff --git a/.git-lb-checkout b/.git-lb-checkout
deleted file mode 100644
index 1f2ebf40f07286db001713bc7294cb7d3f0ef6dd..0000000000000000000000000000000000000000
--- a/.git-lb-checkout
+++ /dev/null
@@ -1,30 +0,0 @@
-[lb-checkout "LHCb.GaudiConf"]
-	base = 55a9a8e2b984ec4f176db58b626fc6d30f7a737b
-	imported = affb586f6b7b15b7057e9b2d648f23287ad1b3a4
-[lb-checkout "LHCb.Event/EventPacker"]
-	base = 2ffa36715e6170dd9270c2156e5c0a30c7ff1606
-	imported = affb586f6b7b15b7057e9b2d648f23287ad1b3a4
-[lb-checkout "LHCb.Hlt/HltDAQ"]
-	base = 0754840ba104673cf71b6c99d56f60a790df65d6
-	imported = affb586f6b7b15b7057e9b2d648f23287ad1b3a4
-[lb-checkout "LHCb.DAQ/DAQKernel"]
-	base = 54243fc729fd7a3cd056e4674e0c619119327620
-	imported = affb586f6b7b15b7057e9b2d648f23287ad1b3a4
-[lb-checkout "LHCb.Event/DAQEvent"]
-	base = f2d6023af5dcd0ff407c87c9de1b3e27cd3e1ccc
-	imported = affb586f6b7b15b7057e9b2d648f23287ad1b3a4
-[lb-checkout "Analysis.Phys/DaVinciMCTools"]
-	base = 64f55284d289e71eebde6401c49887b6618d04c9
-	imported = aa653f30ece350203590ac2038394a00b7cce0eb
-[lb-checkout "Analysis.Phys/AnalysisConf"]
-	base = 3f6b641b6aee50b9a1ad92cda6308f4a8cc9ae76
-	imported = aa653f30ece350203590ac2038394a00b7cce0eb
-[lb-checkout "Analysis.MicroDST/MicroDSTAlgorithm"]
-	base = 9a57d5c3fe5e9451c5fe26e14f44379cf3a3c942
-	imported = aa653f30ece350203590ac2038394a00b7cce0eb
-[lb-checkout "Analysis.MicroDST/MicroDSTBase"]
-	base = 69cebe0528ecbcd997946b87dc714ff3e7bce2da
-	imported = aa653f30ece350203590ac2038394a00b7cce0eb
-[lb-checkout "Analysis.Phys/DSTWriters"]
-	base = 8f20d6acb936952f00c9d405b4545941060a81de
-	imported = aa653f30ece350203590ac2038394a00b7cce0eb
diff --git a/CMakeLists.txt b/CMakeLists.txt
index efc8e6873e49f2f642572422b4f1eb7a2b7d045a..3b6f7d1645eb11148eecfcbb94adf14af4abd1bb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,9 +6,9 @@ find_package(GaudiProject)
 #---------------------------------------------------------------
 
 # Declare project name and version
-gaudi_project(DaVinci v41r4p3
-              USE Analysis v17r4
-                  Stripping v10r11p1
+gaudi_project(DaVinci v41r4p4
+              USE Analysis v17r5
+                  Stripping v10r11p2
               DATA AppConfig VERSION v3r*
                    FieldMap VERSION v5r*
                    ParamFiles VERSION v8r*
diff --git a/DaVinciSys/CMakeLists.txt b/DaVinciSys/CMakeLists.txt
index e2aaed3424f77a9882d29ba7d9986538f712f9f0..212a6d296273d9dab8a5c6969bc8268715c80c83 100644
--- a/DaVinciSys/CMakeLists.txt
+++ b/DaVinciSys/CMakeLists.txt
@@ -1,23 +1,11 @@
 ################################################################################
 # Package: DaVinciSys
 ################################################################################
-gaudi_subdir(DaVinciSys v41r4p3)
+gaudi_subdir(DaVinciSys v41r4p4)
 
 gaudi_depends_on_subdirs(DaVinciTests
                          ##############################
-                         # Temporary patches
-                         GaudiConf
-                         DAQ/DAQKernel
-                         Hlt/HltDAQ
-                         Event/DAQEvent
-                         Event/EventPacker
-                         Phys/DSTWriters
-                         Phys/DaVinciMCTools
-                         Phys/AnalysisConf
-                         MicroDST/MicroDSTAlgorithm
-                         MicroDST/MicroDSTBase
-                         ##############################
-                         # Temporarily moved in from Stripping, for S23 release
+                         # Temporarily moved in from Stripping
                          Phys/StrippingCache
                          ##############################
                          Phys/DaVinci
diff --git a/DaVinciSys/cmt/requirements b/DaVinciSys/cmt/requirements
index 5d5f0b8125628bacb44861954e21d8fe9c6334a7..fe73a19329733a3e655707083d83dbb9e4d4243b 100755
--- a/DaVinciSys/cmt/requirements
+++ b/DaVinciSys/cmt/requirements
@@ -1,20 +1,8 @@
 package DaVinciSys
-version v41r4p3
+version v41r4p4
 
 branches doc cmt
 
-##############################
-# Temporary patches
-use GaudiConf         *
-use DAQKernel         *       DAQ
-use HltDAQ            *       Hlt
-use DAQEvent          *     Event
-use EventPacker       *     Event
-use DSTWriters        *      Phys
-use DaVinciMCTools    *      Phys
-use AnalysisConf      *      Phys
-use MicroDSTAlgorithm *  MicroDST
-use MicroDSTBase      *  MicroDST
 ##############################
 # Temporarily moved in from Stripping, for S23 release
 # To be decided if longer term this stays in the DaVinci 
diff --git a/ReleaseNotes/v41r4p4.md b/ReleaseNotes/v41r4p4.md
new file mode 100644
index 0000000000000000000000000000000000000000..67863451a6b2034fc5cdedae321dbedfb73dabdd
--- /dev/null
+++ b/ReleaseNotes/v41r4p4.md
@@ -0,0 +1,17 @@
+2017-11-28 DaVinci v41r4p4
+==========================
+
+Patch release for the retripping 28 campaign of 2016 data, with TISTOS bug fixes.
+
+This version is released on the 2016-patches branch.
+It is based on Gaudi v27r1, LHCb v40r5, Rec v19r6, Phys v21r8, Analysis v17r5 and Stripping v10r11p2.
+Uses LCG_84 with ROOT 6.06.02.
+
+- Add StrippingCache and tests for S31(r1).
+  -  See merge request !120
+- Updated references for S28, S28r1 and S28r1p1.
+  - See merge request !118
+- Add S28r1 test.
+  - See merge request !108
+- Removed patched packages from DaVinci, to clean up for the new stack release.
+  - See merge request !102
diff --git a/cmt/project.cmt b/cmt/project.cmt
index 2c24f118b394d0974bf38919041d27f77acdbef7..8620c555c86cb68c437edb1e96e1ac35805b0fc4 100755
--- a/cmt/project.cmt
+++ b/cmt/project.cmt
@@ -1,7 +1,7 @@
 project DAVINCI
 
-use ANALYSIS  ANALYSIS_v17r4
-use STRIPPING STRIPPING_v10r11p1
+use ANALYSIS  ANALYSIS_v17r5
+use STRIPPING STRIPPING_v10r11p2
 
 build_strategy with_installarea
 setup_strategy root