More cleanup.
Cleanup and optimization.