Show table of contents
Fix last commit and clean up dead code