Revert "Revert "m7: init: cleanup""

This reverts commit 31f93e2685d18d6962ff7b99c89a75b06b2158ac.