More cleanup, still far from beta.