Remove unnecessary return' calls