Cleanup for the get_list method