remove generators
first draft