remove generators, cleanup
0.1.6