clean up stray types
more cleanup