Remove unrelated code in the #471