Lots of cleaups to add registrations here as well getlantern/lantern#1730