Update to the new EH system...remove OLD EH code.