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

This reverts commit d4c46f3a7ec7068a97c3efa569883513b3d7f30d.
Merge "Revert "Revert "Revert "m7: init: cleanup"""" into kitkat