cleanup init stuff to init/