more cleanups for outbound registrations (bug #4457)