Reduce number of slides, cleanup