CRM-19950 - more clean up