Clean imports/tidy code.
Remove warnings and unused code
Remove BuildVersion/Version and replace by maven generated Version template. Simplify maven build process