More cleanup in init.