case 3211 - Temporary code cleanup.