Should be safe to remove those manual register/unregister