Clean up some list modules