warnings cleanup
more cleanup