Ongoing code cleanup.