Removed debug and dead code
Fixed pom.xml after merge