(WIP) Tidy up WebArchive before public announcement