More cleanup.
Big chunk of cleanup.
A little more cleaning.