Clear bridge listeners when they are no longer used

Change-Id: I6a288f268898c6dc855f57aad4cdac3340e6348d