Remove some unnecessary code causing non-fetal exceptions.