Code cleanup.
More code cleanup.