remove redundant setting of listeners and fix some reentrancy peculiarities therefrom