Merge "Remove unnecesary else blocks"