Removing log fatal statements