Remove more unused stuff
Merge pull request #2 from arco/cm-11.0

Remove more unused stuff