Revert "Commited xtend stuff"

This reverts commit b33768cd75881edf4107016bb639fc0e48293657.