Fix api version and unnecessary conditional at first line