Remove old traces of old style exception (bis;bis)