Cleaning up the TOC