Clean Up
Merge pull request #1 from deadman96385/cm-11.0

Clean Up