Remove more unnecessary else blocks