More cleanup. More things for review.