Removed death stuff and flag for calc_sw_params wasnt being set to a logical