More cleanup, and Anna Karenina