Remove CMM agent strings
Fix build