removed last artefacts from DB-2175 patch (now reverted)