refactor for java 8 functional interface similarity
remove xtext from pom