CEM things
Remove CEM dependency