Remove XML component, includes rename