Ok, all the intertrust lines and the contification stuff have been removed from the history and contification has been removed from the repository.