Remove useless return statements