Remove redundantcode