remove redundant redundancy, rename