minor refactor
switch back to a flat buffer in the batcher

the loop nestings to iterate the map were getting hard to manage
safer dispatcher cleanup