removed generator, using already merged batch spout support, cosmetics