Additional TOC cleanup