Starting to remove XML dependence
Suppresses unneeded dep