Removed pointless ifthen