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

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