--code cleanup for CRM-12024

removed unused code.