I don't think this code is necessary anymore, now that we explicitly tell the listeners when stages end