Remove dependency on xtend