warnings cleanup (still gives lots of compilation warnings from unused functions...