Clean up builder code

[sveitser]

Currently the builders require arguments that are only required because the re-use code for that was written to set up consensus nodes. The code should be de-duplicated and unnecessary parts removed.