case 2069 - Code cleanup.