Remove CM-based functions

This is not pure CM anymore, and these are likely to never
be used by anyone anyway.

Change-Id: I5e226e0ef1f0c45ea22779311b4239fc7625ca69