Remove unnecessary else blocks