More cleanup after code review.