clean up pom. Tidyup Persistence functions.