Remove redundant code on exit path