reduce useless work

I discovered some useless work, that we can get rid of in core.py/generate()