Using a custom builder to support advanced use cases #342
  Finishing touches
  Removing unnecessary (and incorrect) cruft