Clean and remove unused funcs.
Unneeded let was let go
Fit the TOC in nicely, if one exists.