Remove redundancy code