Remove XBase dependency