Bug 923934 - Fix "TypeError: cpmm is undefined" error in activities cleanup. r=fabrice