Remove redundancy