add a missing 'else' and remove an old statement