Merge "Remove needless references to xtend library"