FLUID-4907: removed cross dependencies

Removed the cross dependencies between the primary and auxiliary builders. This was achieved by having them take an empty option for the necessary fields. The builder, which uses the primary and auxiliary builders is responsible for setting the configuration between them.