Reworked m7-common/Clean-up
Merge pull request #2 from BULLDOZ3/cm-10.1

Reworked m7-common/Clean-up