Remove val2List duplication