First cleanup round and compilation ok.
Some unit tests now fail, need to look at those.
This was testing againt Devel branch as of April 26 GIT pull and re-fig-up