ToC cleanup