Safe to remove those manual register/unregister bat and instructions