Remove obsolete batch size from polling client
Some code cleanup.