cleanup & fix bug when createing new list after saved list