Remove empty CM refs since they aren't (yet) added in to BS to fix build...

... error

Change-Id: I831529ba6f784156ae1d4cfc699831b4f3bb0656