more cleanup
Merge pull request #2 from coderzstas/cm-11.0

more cleanup + fix my mistake