Old code cleanup.