Reworked m7-common/Clean-up