Refactoring POM and removing duplicate dependency