Remove CM CAF stuff

Change-Id: Icf222a9fcd2d752461ed03f108e7fc4da361f01b