Cleanup for generator factory class