Still very slow, needs tuning
Pom cleanup
Repo cleanup