Remove Xtend dependency