Xios compiling against latest.  Removed some old , duplicated code.