Reintroduced cleanup for init