Remove redundent code