Remove unbinding before removing listeners refactored

Refactoring of #317