Screw it, removing generator stuff altogether.

Commented code is an eye sore. There, I said it.