Remove commented code
Sketched out specs for generator methods