CORE-4838: removed some more dead code