CORE-3908: removed some dead code and some obsolete code
CORE-3908: removed a bunch of dead code