BATCHEE-29 remove StepContext where not needed

most time it's simple redundant