Added payment_method_list cleaner