More cleanup in init