CORE-5832: removed some obsolete code