Removing XML dep