init: Clean-up