Code tidy. Remove BuildVersion/Version and replace by maven generated Version template