Get rid of extra map(containerId->..), extra events