final clean up(CRM-12463)

more work/clean up