Removed generator-specific code