CORE-4819: removed some dead code