Tidy up
Merge branch 'oja-api-builder' into oja-transaction-manager
Tidy up