Removed death trap?