Finish remove_discovery_document_fetch

close #25