cleanups
[AESH-104]
optionbuilder should work with the new changes now