remove cruft, consolidate some subgenerators
v0.5.0

Cleans up sub-generators.