more cleanup, mostly phi
clean types