adds two && to two if statements in remove_fields link