REmoving if condition