init: revert 7a9d1fe "init: minor clean up"