Added methods for removing listeners