remove unnecessary return statements