Useless else removed