Revert "Add CM Support"

This reverts commit 121cffd0c7c29bf27c351ddc8ce066280f4f6c56.