Moved creation and removal arb param logic.

The arb param logic is now contained in two seperate
methods