Latest code cleanup.