Try to improve chunking
Try to improve chunking in general
Remove unused assignments