Changed cleanup. Looking for cause of duplicates.