KaiRo bug 415 - Consolidate some more setup code into the utilities class