Code cleanup.
More cleanup.