CORE-4838: removed some dead code