another init clean up