More code cleanup.