Remove old listeners.

I had forgotten to remove listeners that were no longer being used.