Cleaned up pom.xml. Some might think too heavily. Please review.