remove the calls to register_peer_object (after talking to Tony)