CORE-4350: removed some dead code