[S390] cleanup trap handling