Clean up XML and add service path