Clean up pom.xml and fix CLM

No match.