Remove generator for now