Remove useless code from transitioning to new EH scheme