removed CM references

Change-Id: Ief916315938eeb9da27d856f4b2ca04f639db1ac