.gitignore update
General cleanup
POM cleanup
removed Util class
more cleanup