Library cleanup and pom cleanup