Pom clean up

Working toward #8