Clean up generator - again