Remove reference to data_dict in condition