Minor template fix, removing useless ifs