remove InvokerFactory interface which has the same signature as StepInvokerProvider, plus some minor tidying up