case 1854 - Code clean-up.