Use restful adapters
Pom cleanup