Generator cleanups