Some clean up in list.