remove extra else