Removing java loop, replaced by JPQL query + Adding service wrappers
Solving conflicts
Removing unused code