Fix TOC width position, remove deprecated comments