removes ErrorHandling (see branch of same name)