POM cleanup and dependency update