removed non-need else