CORE-5775: removed some dead code