Removing TOC and other hacks