More cleanup.
A bit more cleanup.