Some cleanup.
Additional cleanup.