More cleanup from the presentation