remove "if .. else"