Revert "Revert "Revert "m7: init: cleanup"""

This reverts commit d4c46f3a7ec7068a97c3efa569883513b3d7f30d.

Change-Id: I68232540be41b8f502db92807e442e805b745b77