Remove CustomXMLElement as dependency