Remove redundent code"