Make sure disconnection removes all saved references