remove unnecessary return;