Stripped out all of the default generator stuff