Merge "init: cleanup exit() uses"