removed xtend generation where possible and replaced with java code