Removed more XML dependencies