pom cleanup
Use generics for Mojo