TOC cleanup