Generators; cleanup