cleanup above slide 23