Commit before removing listeners