Added more values to the cleanup section.