Remove Content-Type ambiguity. Remove "Context" section
Update TOC