Remove unnecessary return and continue statements