More cleanup following the presentation.