Even more old code cleanup.