Adding libraries to pom; clean up