cleanup to make less diff to codina
Merge pull request #3 from poppmensa/cm-11.0

Misc cleanup