Clean up pom, remove unneeded dependencies
Minor pom cleanup and failed merge fix