Unnecessary return removed