More cleanup and history groundwork