Remove legacy code

$column_list[$key] is the same as $value :) Please fix here and below. Thanks!