Generation streamlining, cleaning up