Revert Builder changes

I don't know how these got merged, but they shouldn't have been.
Clean up Iron Engine APIs
Revert "Revert Builder changes"

This reverts commit b44d60f4fe1bd6bb6381fd43f8f41fbdf623dd14.