Remove dead return and simplify code.