Merge "Clean up pom files"