Clean up pom.xml and fix CLM