diff --git a/bindings/ud.go b/bindings/ud.go
index da1b196a2a08810620dc0d0a68c93b9ec16637ae..89ffcc0614cf15f41ab921eeeced374aba08fa63 100644
--- a/bindings/ud.go
+++ b/bindings/ud.go
@@ -314,13 +314,6 @@ func (ud *UserDiscovery) RemoveFact(factJson []byte) error {
 	return ud.api.RemoveFact(f)
 }
 
-// UnsetAlternativeUserDiscovery clears out the information from the Manager
-// object.
-// todo: should this be removed as well?
-func (ud *UserDiscovery) UnsetAlternativeUserDiscovery() error {
-	return ud.api.UnsetAlternativeUserDiscovery()
-}
-
 ////////////////////////////////////////////////////////////////////////////////
 // User Discovery Lookup                                                      //
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/ud/alternate.go b/ud/alternate.go
index 4f0013bfc77b53278de23012abe7e8d4fe7c876a..7fe78e6964d24bf9222ada44c2a23ed12f81ac40 100644
--- a/ud/alternate.go
+++ b/ud/alternate.go
@@ -51,17 +51,3 @@ func (m *Manager) setAlternateUserDiscovery(altCert, altAddress,
 
 	return nil
 }
-
-// UnsetAlternativeUserDiscovery clears out the information from
-// the Manager object.
-// fixme: I think this should be removed to avoid creating a Manager object
-//  which has never been registered to production, and can't be w/o exporting
-//  the Manger.register method.
-func (m *Manager) UnsetAlternativeUserDiscovery() error {
-	if m.alternativeUd == nil {
-		return errors.New("Alternative User Discovery is already unset.")
-	}
-
-	m.alternativeUd = nil
-	return nil
-}
diff --git a/ud/register.go b/ud/register.go
index e59e378c13e4c23cea768eefdc58e0b9136e61bb..3708ee0790772653893344a35c90c5cc56bbc7ad 100644
--- a/ud/register.go
+++ b/ud/register.go
@@ -17,7 +17,7 @@ import (
 func (m *Manager) register(username string, networkSignature []byte,
 	rng csprng.Source, comm registerUserComms) error {
 
-	// Initialize/Get host
+	// Initialize or get host
 	udHost, err := m.getOrAddUdHost()
 	if err != nil {
 		return errors.WithMessage(err,