remove the If logic