Remove ifthen dependency